commit 1263cc67c09bc7f913a6877f3ba0427f0b76617e tree 5b713315560487f8c288820b17061fe27016c2cc parent b5c44c2147a447f77e07fecdb087ae288e1f4e40 author Benjamin Herrenschmidt Mon, 23 May 2005 10:03:52 +1000 committer Linus Torvalds Sun, 22 May 2005 17:34:42 -0700 [PATCH] ppc64: Fix booting on latest G5 models The latest speedbumped Apple G5 models have a "bug" in the Open Firmware device tree that lacks the proper interrupt routing information for the northbridge i2c controller. Apple's driver silently falls back into a sub-optimal "polled" mode (heh, maybe they didn't even notice the bug because of that :), our driver didn't properly check and crashes :( This patch fixes our driver to not crash, and adds code to the prom_init() OF trampoline code that detects the "bug" and adds the missing information back for this chipset revision. This fixes booting and thermal control on these models. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Linus Torvalds commit f359b74c80bc76c1f6c2cb8f2837882f2335ba0c tree b1f1814337146dc0eb45620825ffe583c6303f59 parent 1808caffaf448f0ad42ba04b25825fc170cf8e44 author Vladimir Saveliev Sat, 21 May 2005 16:33:34 -0700 committer Linus Torvalds Sat, 21 May 2005 16:45:24 -0700 [PATCH] reiserfs: max_key fix This patch fixes a bug introduced by Al Viro's patch: [patch 136/174] reiserfs endianness: clone struct reiserfs_key The problem is MAX_KEY and MAX_IN_CORE_KEY defined in this patch do not look equal from reiserfs comp_key's point of view. This caused reiserfs' sanity check to complain. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5c44c2147a447f77e07fecdb087ae288e1f4e40 tree ec1d95eb1e03e320fc5eb5cfb40379f2f4a7267d parent f359b74c80bc76c1f6c2cb8f2837882f2335ba0c author Suparna Bhattacharya Sat, 21 May 2005 16:33:36 -0700 committer Linus Torvalds Sat, 21 May 2005 16:45:24 -0700 [PATCH] fix for __generic_file_aio_read() to return 0 on EOF I came across the following problem while running ltp-aiodio testcases from ltp-full-20050405 on linux-2.6.12-rc3-mm3. I tried running the tests with EXT3 as well as JFS filesystems. One or two fsx-linux testcases were hung after some time. These testcases were hanging at wait_for_all_aios(). Debugging shows that there were some iocbs which were not getting completed eventhough the last retry for those returned -EIOCBQUEUED. Also all such pending iocbs represented READ operation. Further debugging revealed that all such iocbs hit EOF in the DIO layer. To be more precise, the "pos" from which they were trying to read was greater than the "size" of the file. So the generic_file_direct_IO returned 0. This happens rarely as there is already a check in __generic_file_aio_read(), for whether "pos" < "size" before calling direct IO routine. >size = i_size_read(inode); >if (pos < size) { > retval = generic_file_direct_IO(READ, iocb, > iov, pos, nr_segs); But for READ, we are taking the inode->i_sem only in the DIO layer. So it is possible that some other process can change the size of the file before we take the i_sem. In such a case ( when "pos" > "size"), the __generic_file_aio_read() would return -EIOCBQUEUED even though there were no I/O requests submitted by the DIO layer. This would cause the AIO layer to expect aio_complete() for THE iocb, which doesnot happen. And thus the test hangs forever, waiting for an I/O completion, where there are no requests submitted at all. The following patch makes __generic_file_aio_read() return 0 (instead of returning -EIOCBQUEUED), on getting 0 from generic_file_direct_IO(), so that the AIO layer does the aio_complete(). Testing: I have tested the patch on a SMP machine(with 2 Pentium 4 (HT)) running linux-2.6.12-rc3-mm3. I ran the ltp-aiodio testcases and none of the fsx-linux tests hung. Also the aio-stress tests ran without any problem. Signed-off-by: Suzuki K P Signed-off-by: Suparna Bhattacharya Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1808caffaf448f0ad42ba04b25825fc170cf8e44 tree 4b0ecfabefb62c3b8cfcfb7a72041c34e1f7add7 parent 3d15e4a32dfa3da45751356e5f47aa04b97370e0 parent 912490db699d83cb3d03570b63df7448677a3f56 author Linus Torvalds Sat, 21 May 2005 15:27:09 -0700 committer Linus Torvalds Sat, 21 May 2005 15:27:09 -0700 Merge of master.kernel.org:/home/rmk/linux-2.6-mmc.git commit 3d15e4a32dfa3da45751356e5f47aa04b97370e0 tree 694d78f87107a599ddf66a64360764776a4f5454 parent 10f02d1c59e55f529140dda3a92f0099d748451c parent 857dde2e79082d2954ede7f10783addaae956777 author Linus Torvalds Sat, 21 May 2005 15:04:27 -0700 committer Linus Torvalds Sat, 21 May 2005 15:04:27 -0700 Merge of master.kernel.org:/home/rmk/linux-2.6-serial.git commit 10f02d1c59e55f529140dda3a92f0099d748451c tree 6b5a5804503401624171aff65b09ff022a9f0103 parent 9636273dae265b9354b861b373cd43cd76a6d0fe author Samuel Thibault Sat, 21 May 2005 17:50:15 +0200 committer Linus Torvalds Sat, 21 May 2005 10:46:48 -0700 [PATCH] spin_unlock_bh() and preempt_check_resched() In _spin_unlock_bh(lock): do { \ _raw_spin_unlock(lock); \ preempt_enable(); \ local_bh_enable(); \ __release(lock); \ } while (0) there is no reason for using preempt_enable() instead of a simple preempt_enable_no_resched() Since we know bottom halves are disabled, preempt_schedule() will always return at once (preempt_count!=0), and hence preempt_check_resched() is useless here... This fixes it by using "preempt_enable_no_resched()" instead of the "preempt_enable()", and thus avoids the useless preempt_check_resched() just before re-enabling bottom halves. Signed-off-by: Samuel Thibault Signed-off-by: Linus Torvalds commit 857dde2e79082d2954ede7f10783addaae956777 tree 5a7ba015eb22985d69e03e315b249c4c89750ee2 parent 9636273dae265b9354b861b373cd43cd76a6d0fe author David Woodhouse Sat, 21 May 2005 15:52:23 +0100 committer Russell King Sat, 21 May 2005 15:52:23 +0100 When we detect that a 16550 was in fact part of a NatSemi SuperIO chip with high-speed mode enabled, we switch it to high-speed mode so that baud_base becomes 921600. However, we also need to multiply the baud divisor by 8 at the same time, in case it's already in use as a console. Signed-off-by: David Woodhouse Acked-by: Tom Rini Signed-off-by: Russell King commit 912490db699d83cb3d03570b63df7448677a3f56 tree e2e45ad64584dfa9dbff212a2ba3e884b2bbca43 parent 9636273dae265b9354b861b373cd43cd76a6d0fe author Pierre Ossman Sat, 21 May 2005 10:27:02 +0100 committer Russell King Sat, 21 May 2005 10:27:02 +0100 [PATCH] MMC: Proper MMC command classes support Defines for the different command classes as defined in the MMC and SD specifications. Removes the check for high command classes and instead checks that the command classes needed are present. Previous solution killed forward compatibility at no apparent gain. Signed-of-by: Pierre Ossman commit 9636273dae265b9354b861b373cd43cd76a6d0fe tree cfdcf2133f1846c6f18e21f2a74fc267b8302c3b parent 2df9fa36643f03b0462b170515c1e221c3709fa9 parent 2bf2c568c878b9c0bbacac5c3210a6bd81856d21 author Linus Torvalds Fri, 20 May 2005 17:21:03 -0700 committer Linus Torvalds Fri, 20 May 2005 17:21:03 -0700 Automatic merge of rsync://www.parisc-linux.org/~jejb/git/scsi-for-linus-2.6.git commit 607a16858397829806c5a4db999ce6daf327f98c tree 10f3568581880d54287382dcdfb02dcc5525df8e parent 4057923614e2868a865aa6c6e3bc53542c818d4d author Andi Kleen Fri, 20 May 2005 14:27:58 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:21 -0700 [PATCH] x86_64: Fix 32bit system call restart The test case at http://cvs.sourceforge.net/viewcvs.py/posixtest/posixtestsuite/conforman ce/interfaces/clock_nanosleep/1-5.c fails if it runs as a 32bit process on x86_86 machines. The root cause is the sub 32bit process fails to restart the syscall after it is interrupted by a signal. The syscall number of sys_restart_syscall in table sys_call_table is __NR_restart_syscall (219) while it's __NR_ia32_restart_syscall (0) in ia32_sys_call_table. When regs->rax==(unsigned long)-ERESTART_RESTARTBLOCK, function do_signal doesn't distinguish if the process is 64bit or 32bit, and always sets restart syscall number as __NR_restart_syscall (219). Signed-off-by: Zhang Yanmin Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2df9fa36643f03b0462b170515c1e221c3709fa9 tree 3b4bc0fff308e72050ee02082e2e70745e57b871 parent 14d98cad82b78956957e95567b8b5fb38ec5859f author Andi Kleen Fri, 20 May 2005 14:27:59 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:21 -0700 [PATCH] x86_64: i386/x86-64: Export cpu_core_map Needed for the powernow k8 driver for dual core support. Signed-off-by: Andi Kleen Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 14d98cad82b78956957e95567b8b5fb38ec5859f tree ab1b15e3a2524805495d21be074551f9e553e270 parent 607a16858397829806c5a4db999ce6daf327f98c author Andi Kleen Fri, 20 May 2005 14:27:59 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:21 -0700 [PATCH] x86_64: Add option to disable timer check This works around the too fast timer seen on some ATI boards. I don't feel confident enough about it yet to enable it by default, but give users the option. Patch and debugging from Christopher Allen Wing , with minor tweaks (renamed the option and documented it) Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4d1fcf3a2ea89b6d6221fa8b4588c77aff50995 tree dd102e8f2e67231b91055830b689f203aefdb6cb parent b41e29398a873945d02e0009ce7e57608fdb4042 author Andi Kleen Fri, 20 May 2005 14:27:56 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:20 -0700 [PATCH] x86_64: Don't allow accesses below register frame in ptrace There was a "off by one quad word" error in there. I don't think it is exploitable because it will only store into a unused area, but better to plug it. Found and fixed by John Blackwood Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b41e29398a873945d02e0009ce7e57608fdb4042 tree dc2e4cfd8cb20ce788bc341e9d734adbcebedd27 parent b39c4fab259b216148e705344a892c96efe1946d author Andi Kleen Fri, 20 May 2005 14:27:55 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:20 -0700 [PATCH] x86_64: 386/x86-64 Further AMD dual core fixes - Remove duplicated ifdef - Make core_id match what Intel uses - Initialize phys_proc_id correctly for non DC case - Handle non power of two core numbers. Fixes for both i386 and x86-64 Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7856dfeb23c16ef3d8dac8871b4d5b93c70b59b9 tree 0e9f799c3882dce14b49356c6db10bb6f4ba1713 parent c4d1fcf3a2ea89b6d6221fa8b4588c77aff50995 author Andi Kleen Fri, 20 May 2005 14:27:57 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:20 -0700 [PATCH] x86_64: Fixed guard page handling again in iounmap Caused oopses again. Also fix potential mismatch in checking if change_page_attr was needed. To do it without races I needed to change mm/vmalloc.c to export a __remove_vm_area that does not take vmlist lock. Noticed by Terence Ripperda and based on a patch of his. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4057923614e2868a865aa6c6e3bc53542c818d4d tree 0a6a2b492eaa11897538a06655685474b961df44 parent 7856dfeb23c16ef3d8dac8871b4d5b93c70b59b9 author Andi Kleen Fri, 20 May 2005 14:27:57 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:20 -0700 [PATCH] i386: Fix race in iounmap We need to hold the vmlist_lock while doing change_page_attr, otherwise we could reset someone else's mapping. Requires previous patch to add __remove_vm_area Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b39c4fab259b216148e705344a892c96efe1946d tree 6419f40168e5b9a1eab2a6d413e85d82975dd6b2 parent b2665f92ae67a2d086537979d317a6f3a5697c63 author Paul Jackson Fri, 20 May 2005 13:59:15 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:19 -0700 [PATCH] cpusets+hotplug+preepmt broken This patch removes the entwining of cpusets and hotplug code in the "No more Mr. Nice Guy" case of sched.c move_task_off_dead_cpu(). Since the hotplug code is holding a spinlock at this point, we cannot take the cpuset semaphore, cpuset_sem, as would seem to be required either to update the tasks cpuset, or to scan up the nested cpuset chain, looking for the nearest cpuset ancestor that still has some CPUs that are online. So we just punt and blast the tasks cpus_allowed with all bits allowed. This reverts these lines of code to what they were before the cpuset patch. And it updates the cpuset Doc file, to match. The one known alternative to this that seems to work came from Dinakar Guniguntala, and required the hotplug code to take the cpuset_sem semaphore much earlier in its processing. So far as we know, the increased locking entanglement between cpusets and hot plug of this alternative approach is not worth doing in this case. Signed-off-by: Paul Jackson Acked-by: Nathan Lynch Acked-by: Dinakar Guniguntala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b2665f92ae67a2d086537979d317a6f3a5697c63 tree 96b1c3edd37aadb0ba23758f6455866b047937d6 parent 7f8cd80fb261177244c1479cfcad1387dbf3cd4b author Matt Porter Fri, 20 May 2005 13:59:14 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:19 -0700 [PATCH] ppc32: fix CONFIG_TASK_SIZE handling on 44x This patch fixed CONFIG_TASK_SIZE handling on 44x. Currently head_44x.S hardcodes 0x80000000, which breaks if user chooses to change TASK_SIZE (e.g. for 3G user-space). Tested on Ocotea in 3G/1G configuration. Signed-off-by: Eugene Surovegin Signed-off-by: Matt Porter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 84ddaa8c86fc12ee1c3509be5ff3464821535c17 tree c181d478c5365a32d669d3d9b2899d4d4b06ab25 parent 12f49643bc44c428919b210148a930496827dd26 author Jeff Dike Fri, 20 May 2005 13:59:12 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:19 -0700 [PATCH] uml: Change printf to printk in console driver From: Al Viro - we have error messages with KERN_ERR in them, so they should be printk-ed rather than printf-ed. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f8cd80fb261177244c1479cfcad1387dbf3cd4b tree c4cb14496391f4993aa95f03967feb7394ffcc20 parent 84ddaa8c86fc12ee1c3509be5ff3464821535c17 author Kumar Gala Fri, 20 May 2005 13:59:13 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:19 -0700 [PATCH] ppc32: Fix platform device initialization of 8250 serial ports Initialization of 8250 serial ports that are platform devices require that at empty entry exists in the array of plat_serial8250_port. With out an empty entry we can get some pretty random behavior. Signed-off-by: Kumar Gala Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b67a3c4cd380968bffe8efb681470acda42b441 tree 23ccc071a5862588eb58f95c551f2bc61a9286c6 parent 41a9cf8ebe08ccdd5799c175f9758f14617c0b0a author Jeff Dike Fri, 20 May 2005 13:59:10 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:18 -0700 [PATCH] uml: initrd cleanup The serial UML OS-abstraction layer patch (um/kernel dir). This moves all systemcalls from initrd_user.c file under os-Linux dir and join initrd_user.c and initrd_kern.c files in new file initrd.c Signed-off-by: Gennady Sharapov Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b9014c1da380384efe7752db38a0253a74d0238 tree 5120dc5b523664068b2fa2bdfa153db71d5a37a9 parent 9b67a3c4cd380968bffe8efb681470acda42b441 author Jeff Dike Fri, 20 May 2005 13:59:11 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:18 -0700 [PATCH] uml: Remove ubd-mmap support Finally rip out the ubd-mmap code, which turned out to be broken by design. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41a9cf8ebe08ccdd5799c175f9758f14617c0b0a tree 2542b00300180137b475ba41421b40a5ba10fe4f parent 7c00c31fc0f003363773121a0ac6f4e5b128e879 author Jeff Dike Fri, 20 May 2005 13:59:10 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:18 -0700 [PATCH] uml: Export clear_user_* From: Oleg Drokin: This patch is needed to support kernel modules that want to use clear_user() (that is exported symbol on all other architectures). Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 12f49643bc44c428919b210148a930496827dd26 tree 7a2a17f124a36cb498b3ce4f2b91568e086bb7ed parent 7b9014c1da380384efe7752db38a0253a74d0238 author Jeff Dike Fri, 20 May 2005 13:59:12 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:18 -0700 [PATCH] uml: fixrange_init 3-level page table support From: Al Viro - add three-level page table support to fixrange_init. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba9950c820e556e39cd26581826b5581a64fb641 tree 4ba37ce6b1852e95619ad3e6bd97a2032dd4c1fc parent 46f4e1b7d5fa3ddf2486bf69716c404147e38ebf author Jeff Dike Fri, 20 May 2005 13:59:07 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:17 -0700 [PATCH] uml: small fixes left over from rc4 Some changes that I sent in didn't make 2.6.12-rc4 for some reason. This adds them back. We have an x86_64 definition of TOP_ADDR a reimplementation of the x86_64 csum_partial_copy_from_user some syntax fixes in arch/um/kernel/ptrace.c removal of a CFLAGS definition in the x86_64 Makefile some include changes in the x86_64 ptrace.c and user-offsets.h a syntax fix in elf-x86_64.h Also moved an include in the i386 and x86_64 Makefiles to make the symlinks work, and some small fixes from Al Viro. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c00c31fc0f003363773121a0ac6f4e5b128e879 tree 8b9f64e74f795d461cb121425ddd2b1eaf911242 parent 060e352236ece3325a684c72817fbacdac597574 author Jeff Dike Fri, 20 May 2005 13:59:09 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:17 -0700 [PATCH] uml: multicast driver cleanup Byte-swapping of the port and IP address passed in to the multicast driver by the user used to happen in different places, which was a bug in itself. The port also was swapped before being printk-ed, which led to a misleading message. This patch moves the port swapping to the same place as the IP address swapping. It also cleans up the error paths of mcast_open. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 13479d52c7a61a18900d7f36730b7d3b43723d97 tree b8c23b0a7d06155ca7a8a7f5c0c55dbc5cbd870e parent ba9950c820e556e39cd26581826b5581a64fb641 author Jeff Dike Fri, 20 May 2005 13:59:08 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:17 -0700 [PATCH] uml: Page fault fixes Any access to a PROT_NONE page should segfault the process. A JVM seems to do this on purpose. Also, Al noticed some bogus code, which is now deleted. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 060e352236ece3325a684c72817fbacdac597574 tree 32d573bfa99e31a5318eda247246261fdd13cd3e parent 13479d52c7a61a18900d7f36730b7d3b43723d97 author Jeff Dike Fri, 20 May 2005 13:59:08 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:17 -0700 [PATCH] uml: Delay loop cleanups This patch cleans up the delay implementations a bit, makes the loops unoptimizable, and exports __udelay and __const_udelay. Signed-off-by: Jeff Dike Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 46f4e1b7d5fa3ddf2486bf69716c404147e38ebf tree 8c632478e9e5c0b0a2f9601542e54d8f02250cb1 parent 1c7878f024705594ac455e501ad51e475a400d5d author Peter Osterlund Fri, 20 May 2005 13:59:06 -0700 committer Linus Torvalds Fri, 20 May 2005 15:48:16 -0700 [PATCH] packet driver permission checking fix If you tried to open a packet device first in read-only mode and then a second time in read-write mode, the second open succeeded even though the device was not correctly set up for writing. If you then tried to write data to the device, the writes would fail with I/O errors. This patch prevents that problem by making the second open fail with -EBUSY. Signed-off-by: Peter Osterlund Cc: Al Viro Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2bf2c568c878b9c0bbacac5c3210a6bd81856d21 tree d9be308337b4cca0f0829b0bd62f1d5b830954e1 parent fb3089dfb58bf07992252b42e77c6f35d45dff5e author James Bottomley Thu, 19 May 2005 21:30:13 -0500 committer James Bottomley Fri, 20 May 2005 16:43:51 -0500 [SCSI] aic7xxx: fix U160 mode The new period/dt setting routines don't get the coupling of these parameters correct. This means that Domain Validation never gets DT set, and thus the drive gets restricted to U80. Fix this by restoring the couplings in the set routines. Signed-off-by: James Bottomley commit fb3089dfb58bf07992252b42e77c6f35d45dff5e tree 4626cee6ff060843a6d717156d3a119a8cb4b482 parent c7525233d2df39b95552f6f49c6b390a9c4d2e80 author James Bottomley Tue, 17 May 2005 21:09:52 -0500 committer James Bottomley Fri, 20 May 2005 15:54:43 -0500 [SCSI] aic7xxx: add back locking Tampering with the settings has to be done under the host lock ... slave_alloc isn't called under any lock, so this has to be done explicitly. Signed-off-by: James Bottomley commit c7525233d2df39b95552f6f49c6b390a9c4d2e80 tree 6a2336435ea1a2bf1ae6b445d6b1109e0599a2a3 parent 8e45ebcc661069bfb002c56dd942aedf43ba9239 author James Bottomley Tue, 17 May 2005 18:07:34 -0500 committer James Bottomley Fri, 20 May 2005 15:54:42 -0500 [SCSI] aic7xxx: make correct use of slave_alloc/destroy and remove the per device timer The allocation of all of our components should be done in slave alloc. Currently it's rather fancifully refcounted in the queuecommand callback. This patch moves allocation and destroy to their correct places in slave_alloc/slave_destory. Now we can guarantee that everywhere a device is requested, it's actually been allocated, so don't check for this anymore. Additionally, the per device busy timer was the only source of potential use after free. It's been deleted because Linux does the correct thing with busy returns, so there's no need to implement a separate timer in the driver. Finally, implement code that forces all the device parameters to zero (i.e. async and narrow) in the slave alloc, inform the spi class of the bios recorded maximums and wait until slave configure before trying anything more adventurous. Signed-off-by: James Bottomley commit 8e45ebcc661069bfb002c56dd942aedf43ba9239 tree 215c5b710ee6cbd55b0a51f9267486b9c263e67a parent 38c29ce06d24691d6e6dd786175fcc54efd5995b author James Bottomley Tue, 17 May 2005 00:06:08 -0500 committer James Bottomley Fri, 20 May 2005 15:54:40 -0500 [SCSI] aic7xxx: remove the completeq This should finish the spurious queue removal from aic7xxx (there are other queues that are probably unnecessary, but at least the major and obviously unnecessary ones are done with). Signed-off-by: James Bottomley commit 38c29ce06d24691d6e6dd786175fcc54efd5995b tree 23baaee4a2716a02d25e09cdab49439779fa94c9 parent 013791ee01754f83dbb4ccfd266381db74e120b5 author James Bottomley Mon, 16 May 2005 21:37:58 -0500 committer James Bottomley Fri, 20 May 2005 15:54:39 -0500 [SCSI] aic7xxx: remove the last vestiges of the runq This was rendered obsolete by the busyq removal; remove some of the last remnants of its presence. Signed-off-by: James Bottomley commit 013791ee01754f83dbb4ccfd266381db74e120b5 tree ee111c4f8d5e6e2664a34ab8d730e2ecb25d894e parent 7dfa0f2673c17334c5de75a449f7bc161c9bd2c0 author Christoph Hellwig Mon, 16 May 2005 18:52:39 +0200 committer James Bottomley Fri, 20 May 2005 15:54:38 -0500 [SCSI] aic7xxx: remove usage of obsolete typedefs Signed-off-by: James Bottomley commit 7dfa0f2673c17334c5de75a449f7bc161c9bd2c0 tree 0cb95e4fdef14b0a4decc2ebed5a2abee057db6f parent dedd831081052028f35aaf924ea3d6c55109074f author Christoph Hellwig Mon, 16 May 2005 18:54:12 +0200 committer James Bottomley Fri, 20 May 2005 15:54:37 -0500 [SCSI] remove dma_mask hacks pci_alloc_consistent is under 4G by default. Also simplify the definition of bus_dmamap_t. Signed-off-by: James Bottomley commit dedd831081052028f35aaf924ea3d6c55109074f tree 518497bc7e5aa491bc932d50149ce96cae0b26c3 parent c06716fe1cea97749668c83e8374b453fbd00823 author Christoph Hellwig Mon, 16 May 2005 18:52:06 +0200 committer James Bottomley Fri, 20 May 2005 15:54:36 -0500 [SCSI] aic7xxx: remove Linux 2.4 ifdefs There's not much sense in sharing code anymore now that aic7xxx uses various transport class facilities. Signed-off-by: James Bottomley commit c06716fe1cea97749668c83e8374b453fbd00823 tree 25bdeb4b6a09dee33dd0da7f284d710883aea595 parent e4e360c325c90f7830baaa2a27cd7a1f2bdeb6b0 author Christoph Hellwig Mon, 16 May 2005 18:51:13 +0200 committer James Bottomley Fri, 20 May 2005 15:54:35 -0500 [SCSI] aic7xxx: remove some DV leftovers Signed-off-by: James Bottomley commit e4e360c325c90f7830baaa2a27cd7a1f2bdeb6b0 tree 238462ee734bd13cb6b7036b4dc207ecf57f3a48 parent fad01ef88d2a27303757924c1fc013b31fe9a76b author James Bottomley Mon, 16 May 2005 16:39:38 -0500 committer James Bottomley Fri, 20 May 2005 15:54:34 -0500 [SCSI] remove aic7xxx busyq The aic7xxx driver has two spurious queues in it's linux glue code: the busyq which queues incoming commands to the driver and the completeq which queues finished commands before sending them back to the mid-layer This patch just removes the busyq and makes the aic finally return the correct status to get the mid-layer to manage its queueing, so a command is either committed to the sequencer or returned to the midlayer for requeue. Signed-off-by: James Bottomley commit fad01ef88d2a27303757924c1fc013b31fe9a76b tree 8f1fe69d0610117452335a4b5224c856c8f2d256 parent 62a8612972eaea804e1e42c63ee403cd4e14cc35 author James Bottomley Sun, 08 May 2005 16:00:15 -0500 committer James Bottomley Fri, 20 May 2005 15:54:33 -0500 [SCSI] correct aic7xxx period setting routines This is similar to the previous sym2 problem. For Domain Validation to work we can't allow any period setting to turn wide on if it was previously off. Signed-off-by: James Bottomley commit 62a8612972eaea804e1e42c63ee403cd4e14cc35 tree 15411e03ce3030849bb99e5d89874bb4032e32e6 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author James Bottomley Fri, 06 May 2005 18:05:20 -0500 committer James Bottomley Fri, 20 May 2005 15:54:32 -0500 [SCSI] implement parameter limits in the SPI transport class There's a basic need not to have parameters go under or over certain values when doing domain validation. The basic ones are max_offset, max_width and min_period This patch makes the transport class take and enforce these three limits. Currently they can be set by the user, although they could obviously be read from the HBA's on-board NVRAM area during slave_configure (if it has one). Signed-off-by: James Bottomley commit 1c7878f024705594ac455e501ad51e475a400d5d tree 778369e948726f33de5cd7a515d7ff5724f80d19 parent a228dfd5dc4b92288ea22d427b2bfc48ba5bb8b0 author Linus Torvalds Fri, 20 May 2005 13:36:19 -0700 committer Linus Torvalds Fri, 20 May 2005 13:36:19 -0700 Remove some left-over empty files Hopefully the addition of -E to my applypatch script will mean that I won't have these kinds of leftovers in the future. commit a228dfd5dc4b92288ea22d427b2bfc48ba5bb8b0 tree bd3c9a5892a5e3823427c9d614fd6c9aee96c1fb parent 37e0915b701281182cea9fc90e894d10addf134a author David S. Miller Fri, 20 May 2005 11:40:32 -0700 committer David S. Miller Fri, 20 May 2005 11:40:32 -0700 [SPARC64]: Fix bad performance side effect of strbuf timeout changes. The recent change to add a timeout to strbuf flushing had a negative performance impact. The udelay()'s are too long, and they were done in the wrong order wrt. the register read checks. Fix both, and things are happy again. There are more possible improvements in this area. In fact, PCI streaming buffer flushing seems to be part of the bottleneck in network receive performance on my SunBlade1000 box. Signed-off-by: David S. Miller commit 37e0915b701281182cea9fc90e894d10addf134a tree e327b635e017dfcfd989b203c16ebd55e1d2526b parent 45fed46f5b98aaf439e9ef125992ec853cd98499 author Corey Minyard Fri, 20 May 2005 08:56:23 +0200 committer Linus Torvalds Fri, 20 May 2005 07:58:04 -0700 [PATCH] Add sysfs support for the IPMI device interface Add support for sysfs to the IPMI device interface. Clean-ups based on Dimitry Torokovs comment by Philipp Hahn. Signed-off-by: Corey Minyard Signed-off-by: Philipp Hahn Signed-off-by: Linus Torvalds commit 45fed46f5b98aaf439e9ef125992ec853cd98499 tree 6b1637f2083772b08337ba62a33ac6a4547ae788 parent 72480ef863740c3dc301b0803c9ed6d10716aa11 author Paul Mackerras Fri, 20 May 2005 16:45:58 +1000 committer Linus Torvalds Fri, 20 May 2005 07:54:11 -0700 [PATCH] ppx32: Fix uninitialized variable in set_preferred_console This fixes an uninitialized variable warning in arch/ppc/kernel/setup.c, and this time gcc is actually right, there is a path that could result in offset being uninitialized. Zero is a sane default in this instance. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 72480ef863740c3dc301b0803c9ed6d10716aa11 tree 958a49f87b40c6a208d95f85e5e93f2f39b77d3d parent 3207a80a6e11c7ceff7e46d5ec6bfcc03c14e729 author Paul Mackerras Fri, 20 May 2005 16:50:55 +1000 committer Linus Torvalds Fri, 20 May 2005 07:54:10 -0700 [PATCH] ppc32: Fix __copy_tofrom_user return value Recently the __copy_tofrom_user routine was modified to avoid doing prefetches past the end of the source array. However, in doing so we introduced a bug in that it now returns the wrong value for the number of bytes not copied when a fault is encountered. This fixes it to return the correct number. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 6c37a88c5b1195d4ac74d44a6413839b93df5af4 tree 3b829314447f53686bc028dd32f614bb4a8a1cbc parent 07ab67c8d0d7c1021343b7d5c045033d6bf7be69 author Paul Mackerras Fri, 20 May 2005 16:57:22 +1000 committer Linus Torvalds Fri, 20 May 2005 07:54:10 -0700 [PATCH] ppc32: don't call progress functions after boot On ppc32, the platform code can supply a "progress" function that is used to show progress through the boot. These functions are usually in an init section and so can't be called after the init pages are freed. Now that the cpu bringup code can be called after the system is booted (for hotplug cpu) we can get the situation where the progress function can be called after boot. The simple fix is to set the progress function pointer to NULL when the init pages are freed, and that is what this patch does (note that all callers already check whether the function pointer is NULL before trying to call it). Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 3207a80a6e11c7ceff7e46d5ec6bfcc03c14e729 tree e0703f620ae7ccd0dd06a7a0c0b51f1e4136aaf2 parent 6c37a88c5b1195d4ac74d44a6413839b93df5af4 author Paul Mackerras Fri, 20 May 2005 17:15:00 +1000 committer Linus Torvalds Fri, 20 May 2005 07:54:10 -0700 [PATCH] ppc32: remove unused computation We are computing phys in the code below and never using. This patch takes out the redundant computation. Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit 07ab67c8d0d7c1021343b7d5c045033d6bf7be69 tree 5857098ebbb760afc8b0d722f119e06b3d1f6511 parent 66e60f92518268f4d2a702a1c4ffbe1caacd6290 author Linus Torvalds Thu, 19 May 2005 22:43:37 -0700 committer Linus Torvalds Thu, 19 May 2005 22:43:37 -0700 Fix get_unmapped_area sanity tests As noted by Chris Wright, we need to do the full range of tests regardless of whether MAP_FIXED is set or not, so re-organize get_unmapped_area() slightly to do the sanity checks unconditionally. commit 66e60f92518268f4d2a702a1c4ffbe1caacd6290 tree 889a1e2919ac50253be8136a1b0855fde27fcb36 parent 804c64ea864d0a8ee13f3de0b74158a3e9c3166d parent 4b40033ef110b833986c1a1d958a951b695f9fbc author Linus Torvalds Thu, 19 May 2005 15:31:18 -0700 committer Linus Torvalds Thu, 19 May 2005 15:31:18 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6.git/ commit 804c64ea864d0a8ee13f3de0b74158a3e9c3166d tree 842b223e9db75ece9f4e2a5daf0f519b07b4a92a parent 49a43876b935c811cfd29d8fe998a6912a1cc5c4 parent aa1c6a6f7f0518b42994d02756a41cbfdcac1916 author Linus Torvalds Thu, 19 May 2005 15:29:23 -0700 committer Linus Torvalds Thu, 19 May 2005 15:29:23 -0700 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/ commit aa1c6a6f7f0518b42994d02756a41cbfdcac1916 tree f56cbf31594d904ecc711269c14c206cf08c0126 parent 68acc024ea7391e03c2c695ba0b9fb31baa974bf author Tommy S. Christensen Thu, 19 May 2005 13:07:32 -0700 committer David S. Miller Thu, 19 May 2005 13:07:32 -0700 [NETLINK]: Defer socket destruction a bit In netlink_broadcast() we're sending shared skb's to netlink listeners when possible (saves some copying). This is OK, since we hold the only other reference to the skb. However, this implies that we must drop our reference on the skb, before allowing a receiving socket to disappear. Otherwise, the socket buffer accounting is disrupted. Signed-off-by: Tommy S. Christensen Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 68acc024ea7391e03c2c695ba0b9fb31baa974bf tree 0a4108d9294bc1d6de5fe9fdddea8c105047acb9 parent db61ecc3352d72513c1b07805bd6f760e30c001b author Tommy S. Christensen Thu, 19 May 2005 13:06:35 -0700 committer David S. Miller Thu, 19 May 2005 13:06:35 -0700 [NETLINK]: Move broadcast skb_orphan to the skb_get path. Cloned packets don't need the orphan call. Signed-off-by: Tommy S. Christensen Acked-by: Herbert Xu Signed-off-by: David S. Miller commit db61ecc3352d72513c1b07805bd6f760e30c001b tree c85af775fc7eccbb12501e0a8d42cd5d284e494d parent 1eda339e76a9aac05883c548028bf91aed734783 author Tommy S. Christensen Thu, 19 May 2005 12:46:59 -0700 committer David S. Miller Thu, 19 May 2005 12:46:59 -0700 [NETLINK]: Fix race with recvmsg(). This bug causes: assertion (!atomic_read(&sk->sk_rmem_alloc)) failed at net/netlink/af_netlink.c (122) What's happening is that: 1) The skb is sent to socket 1. 2) Someone does a recvmsg on socket 1 and drops the ref on the skb. Note that the rmalloc is not returned at this point since the skb is still referenced. 3) The same skb is now sent to socket 2. This version of the fix resurrects the skb_orphan call that was moved out, last time we had 'shared-skb troubles'. It is practically a no-op in the common case, but still prevents the possible race with recvmsg. Signed-off-by: Tommy S. Christensen Acked-by: Herbert Xu Signed-off-by: David S. Miller commit 1eda339e76a9aac05883c548028bf91aed734783 tree 20b48f91183952048c388b353660443e44e6158f parent 31c26852cb2ac77f1d4acb37bcf31f165fd5eb68 author Jamal Hadi Salim Thu, 19 May 2005 12:42:39 -0700 committer David S. Miller Thu, 19 May 2005 12:42:39 -0700 [PKT_SCHED]: Fixup simple action define. Make it consistent with other net/sched files Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit 31c26852cb2ac77f1d4acb37bcf31f165fd5eb68 tree ce2e98c79f4d9051baff55c5f5fdb90defb9e18e parent b9e9dead05b19e7f52c9aa00cd3a5b7ac4fcacf4 author Herbert Xu Thu, 19 May 2005 12:39:49 -0700 committer David S. Miller Thu, 19 May 2005 12:39:49 -0700 [IPSEC]: Verify key payload in verify_one_algo We need to verify that the payload contains enough data so that attach_one_algo can copy alg_key_len bits from the payload. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit b9e9dead05b19e7f52c9aa00cd3a5b7ac4fcacf4 tree 89852e61eaea7cd88c652e91b594fd8f4c312a9d parent 8be58932ca596972e4953ae980d8bc286857cae8 author Herbert Xu Thu, 19 May 2005 12:39:04 -0700 committer David S. Miller Thu, 19 May 2005 12:39:04 -0700 [IPSEC]: Fixed alg_key_len usage in attach_one_algo The variable alg_key_len is in bits and not bytes. The function attach_one_algo is currently using it as if it were in bytes. This causes it to read memory which may not be there. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit 8be58932ca596972e4953ae980d8bc286857cae8 tree 44ee4e92a652bdbc3f3f368bc8f253ce9539a13a parent d9fa0f392b20b2b8e3df379c44194492a2446c6e author David S. Miller Thu, 19 May 2005 12:36:33 -0700 committer David S. Miller Thu, 19 May 2005 12:36:33 -0700 [NETFILTER]: Do not be clever about SKB ownership in ip_ct_gather_frags(). Just do an skb_orphan() and be done with it. Based upon discussions with Herbert Xu on netdev. Signed-off-by: David S. Miller commit d9fa0f392b20b2b8e3df379c44194492a2446c6e tree 497580f07eeecfabd15b0a55601b7b6890372596 parent f81a0bffa116ea22149aa7cfb0b4ee09096d9d92 author Julian Anastasov Thu, 19 May 2005 12:29:59 -0700 committer David S. Miller Thu, 19 May 2005 12:29:59 -0700 [IP_VS]: Remove extra __ip_vs_conn_put() for incoming ICMP. Remove extra __ip_vs_conn_put for incoming ICMP in direct routing mode. Mark de Vries reports that IPVS connections are not leaked anymore. Signed-off-by: Julian Anastasov Signed-off-by: David S. Miller commit f81a0bffa116ea22149aa7cfb0b4ee09096d9d92 tree 2266a1ee3719bc62caa9dfd88b16195bc8a79cc4 parent 2fdba6b085eb7068e9594cfa55ffe40466184b4d author Christoph Hellwig Thu, 19 May 2005 12:26:43 -0700 committer David S. Miller Thu, 19 May 2005 12:26:43 -0700 [AF_UNIX]: Use lookup_create(). currently it opencodes it, but that's in the way of chaning the lookup_hash interface. I'd prefer to disallow modular af_unix over exporting lookup_create, but I'll leave that to you. Signed-off-by: Christoph Hellwig Signed-off-by: David S. Miller commit 49a43876b935c811cfd29d8fe998a6912a1cc5c4 tree c7d7a187a2125518e655dfeadffd38156239ffc3 parent 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 author Linus Torvalds Wed, 18 May 2005 15:39:33 -0700 committer Linus Torvalds Thu, 19 May 2005 07:46:36 -0700 [PATCH] prevent NULL mmap in topdown model Prevent the topdown allocator from allocating mmap areas all the way down to address zero. We still allow a MAP_FIXED mapping of page 0 (needed for various things, ranging from Wine and DOSEMU to people who want to allow speculative loads off a NULL pointer). Tested by Chris Wright. Signed-off-by: Linus Torvalds commit 2fdba6b085eb7068e9594cfa55ffe40466184b4d tree 2f7325f9f62cc643caf6d6c8dd7a24b1cb94ebd0 parent d48102007d068df7ba3055cdc1723e12db1ba30f author Herbert Xu Wed, 18 May 2005 22:52:33 -0700 committer David S. Miller Wed, 18 May 2005 22:52:33 -0700 [IPV4/IPV6] Ensure all frag_list members have NULL sk Having frag_list members which holds wmem of an sk leads to nightmares with partially cloned frag skb's. The reason is that once you unleash a skb with a frag_list that has individual sk ownerships into the stack you can never undo those ownerships safely as they may have been cloned by things like netfilter. Since we have to undo them in order to make skb_linearize happy this approach leads to a dead-end. So let's go the other way and make this an invariant: For any skb on a frag_list, skb->sk must be NULL. That is, the socket ownership always belongs to the head skb. It turns out that the implementation is actually pretty simple. The above invariant is actually violated in the following patch for a short duration inside ip_fragment. This is OK because the offending frag_list member is either destroyed at the end of the slow path without being sent anywhere, or it is detached from the frag_list before being sent. Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit d48102007d068df7ba3055cdc1723e12db1ba30f tree 54f01cd1163bb552d5e1a647069663c4a28a1396 parent f7383c22246cfccbe912541dd83103009ed2b537 author Evgeniy Polyakov Wed, 18 May 2005 22:51:45 -0700 committer David S. Miller Wed, 18 May 2005 22:51:45 -0700 [XFRM]: skb_cow_data() does not set proper owner for new skbs. It looks like skb_cow_data() does not set proper owner for newly created skb. If we have several fragments for skb and some of them are shared(?) or cloned (like in async IPsec) there might be a situation when we require recreating skb and thus using skb_copy() for it. Newly created skb has neither a destructor nor a socket assotiated with it, which must be copied from the old skb. As far as I can see, current code sets destructor and socket for the first one skb only and uses truesize of the first skb only to increment sk_wmem_alloc value. If above "analysis" is correct then attached patch fixes that. Signed-off-by: Evgeniy Polyakov Acked-by: Herbert Xu Signed-off-by: David S. Miller commit f7383c22246cfccbe912541dd83103009ed2b537 tree 264daa71bdac2165fe26ab7d3b8010a3609ee1e7 parent 59e6b4343299373bc10dd131ab5142f53ddd838a author David S. Miller Wed, 18 May 2005 22:50:53 -0700 committer David S. Miller Wed, 18 May 2005 22:50:53 -0700 [TG3]: In tg3_poll(), resample status_tag after doing work. Signed-off-by: David S. Miller commit 59e6b4343299373bc10dd131ab5142f53ddd838a tree 1381e9d661f4ff83e89cb17678ce4813a90c4afb parent 15f9850d3c2d46f5851a424d2990a18b5bb5ebfd author David S. Miller Wed, 18 May 2005 22:50:10 -0700 committer David S. Miller Wed, 18 May 2005 22:50:10 -0700 [TG3]: Refine DMA boundary setting. Extract DMA boundary bit selection into a seperate function, tg3_calc_dma_bndry(). Call this from tg3_test_dma(). Make DMA test more reliable by using no DMA boundry setting during the test. If the test passes, then use the setting we selected before the test. Signed-off-by: David S. Miller Signed-off-by: Michael Chan commit 15f9850d3c2d46f5851a424d2990a18b5bb5ebfd tree a96514f0f797e0a315e12450279d103a888d1083 parent fac9b83ea79aa3112ed245d9a4fc2a5c3ec2b7ec author David S. Miller Wed, 18 May 2005 22:49:26 -0700 committer David S. Miller Wed, 18 May 2005 22:49:26 -0700 [TG3]: Set minimal hw interrupt mitigation. Even though we do software interrupt mitigation via NAPI, it still helps to have some minimal hw assisted mitigation. This helps, particularly, on systems where register I/O overhead is much greater than the CPU horsepower. For example, it helps on NUMA systems. In such cases the PIO overhead to disable interrupts for NAPI accounts for the majority of the packet processing cost. The CPU is fast enough such that only a single packet is processed by each NAPI poll call. Thanks to Michael Chan for reviewing this patch. Signed-off-by: David S. Miller commit fac9b83ea79aa3112ed245d9a4fc2a5c3ec2b7ec tree 14749e6e5e0abdfb707b41dad714e36246e6cff8 parent 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 author David S. Miller Wed, 18 May 2005 22:46:34 -0700 committer David S. Miller Wed, 18 May 2005 22:46:34 -0700 [TG3]: Add tagged status support. When supported, use the TAGGED interrupt processing support the chip provides. In this mode, instead of a "on/off" binary semaphore, an incrementing tag scheme is used to ACK interrupts. All MSI supporting chips support TAGGED mode, so the tg3_msi() interrupt handler uses it unconditionally. This invariant is verified when MSI support is tested. Since we can invoke tg3_poll() multiple times per interrupt under high packet load, we fetch a new copy of the tag value in the status block right before we actually do the work. Also, because the tagged status tells the chip exactly which work we have processed, we can make two optimizations: 1) tg3_restart_ints() need not check tg3_has_work() 2) the tg3_timer() need not poke the chip 10 times per second to keep from losing interrupt events Based upon valuable feedback from Michael Chan Signed-off-by: David S. Miller commit 05d3794aa8bd3b2c9f7920a05003c331cdeb75c5 tree 46ae0ec07caf01fa5c743112ae8ee932d1e66854 parent 301216244b1e39c4346e56d38b079ca53d528580 parent 0b405a0f7e4d4d18fd1fe46ddf5ff465443036ab author Linus Torvalds Wed, 18 May 2005 16:37:46 -0700 committer Linus Torvalds Wed, 18 May 2005 16:37:46 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6.git/ commit e72022e13d659bece2fc9cb2dd97afa67047dbca tree c71a8bf39274d7ad105e0618a7f0ff57d1509c17 parent d1ded203adf16b42ca90e9041120ae465ca5c4a6 author Stephen Tweedie Wed, 18 May 2005 11:22:31 -0400 committer Linus Torvalds Wed, 18 May 2005 09:10:02 -0700 [PATCH] Fix filp being passed through raw ioctl handler Don't pass meaningless file handles to block device ioctls. The recent raw IO ioctl-passthrough fix started passing the raw file handle into the block device ioctl handler. That's unlikely to be useful, as the file handle is actually open on a character-mode raw device, not a block device, so dereferencing it is not going to yield useful results to a block device ioctl handler. Previously we just passed NULL; also not a value that can usefully be dereferenced, but at least if it does happen, we'll oops instead of silently pretending that the file is a block device, so NULL is the more defensive option here. This patch reverts to that behaviour. Noticed by Al Viro. Signed-off-by: Stephen Tweedie Acked-by: Al Viro Signed-off-by: Linus Torvalds commit 301216244b1e39c4346e56d38b079ca53d528580 tree 4a16a1f4cf249d713e565c1b2113ca3b38d3ba45 parent e72022e13d659bece2fc9cb2dd97afa67047dbca author Stephen Tweedie Wed, 18 May 2005 11:47:17 -0400 committer Linus Torvalds Wed, 18 May 2005 09:10:02 -0700 [PATCH] Avoid console spam with ext3 aborted journal. Avoid console spam with ext3 aborted journal. ext3 usually reports error conditions that it detects in its environment. But when its journal gets aborted due to such errors, it can sometimes continue to report that condition forever, spamming the console to such an extent that the initial first cause of the journal abort can be lost. When the journal aborts, we put the filesystem into readonly mode. Most subsequent filesystem operations will get rejected immediately by checks for MS_RDONLY either in the filesystem or in the VFS. But some paths do not have such checks --- for example, if we continue to write to a file handle that was opened before the fs went readonly. (We only check for the ROFS condition when the file is first opened.) In these cases, we can continue to generate log errors similar to EXT3-fs error (device $DEV) in start_transaction: Journal has aborted for each subsequent write. There is really no point in generating these errors after the initial error has been fully reported. Specifically, if we're starting a completely new filesystem operation, and the filesystem is *already* readonly (ie. the ext3 layer has already detected and handled the underlying jbd abort), and we see an EROFS error, then there is simply no point in reporting it again. Signed-off-by: Stephen Tweedie Signed-off-by: Linus Torvalds commit 0b405a0f7e4d4d18fd1fe46ddf5ff465443036ab tree 49d74df6eddfdd095c650e0af34cde7f4548a2d5 parent 82428b62aa6294ea640c7e920a9224ecaf46db65 author David Brownell Thu, 12 May 2005 12:06:27 -0700 committer Greg KH Tue, 17 May 2005 14:54:55 -0700 [PATCH] Driver Core: remove driver model detach_state The driver model has a "detach_state" mechanism that: - Has never been used by any in-kernel drive; - Is superfluous, since driver remove() methods can do the same thing; - Became buggy when the suspend() parameter changed semantics and type; - Could self-deadlock when called from certain suspend contexts; - Is effectively wasted documentation, object code, and headspace. This removes that "detach_state" mechanism; net code shrink, as well as a per-device saving in the driver model and sysfs. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 82428b62aa6294ea640c7e920a9224ecaf46db65 tree f9e9bfd1f86f739ee16968378057060417f52bb4 parent ff0d2f90fdc4b564d47a7c26b16de81a16cfa28e author David Brownell Mon, 09 May 2005 08:07:00 -0700 committer Greg KH Tue, 17 May 2005 14:54:54 -0700 [PATCH] Driver Core: pm diagnostics update, check for errors This patch includes various tweaks in the messaging that appears during system pm state transitions: * Warn about certain illegal calls in the device tree, like resuming child before parent or suspending parent before child. This could happen easily enough through sysfs, or in some cases when drivers use device_pm_set_parent(). * Be more consistent about dev_dbg() tracing ... do it for resume() and shutdown() too, and never if the driver doesn't have that method. * Say which type of system sleep state is being entered. Except for the warnings, these only affect debug messaging. Signed-off-by: David Brownell Acked-by: Pavel Machek Signed-off-by: Greg Kroah-Hartman commit d1ded203adf16b42ca90e9041120ae465ca5c4a6 tree 59c3218467807e1793fb4fc5d90141e072ab2212 parent 9888549e0507cc95d1d7ade1595c00ff8e902659 author Greg KH Thu, 05 May 2005 11:57:25 -0700 committer Greg KH Tue, 17 May 2005 14:31:12 -0700 [PATCH] PCI: add MODALIAS to hotplug event for pci devices Signed-off-by: Greg Kroah-Hartman commit 9888549e0507cc95d1d7ade1595c00ff8e902659 tree 9c31d2b34ef9b747733f7f39916a8031f89c3d1e parent c22610dadc0452b1273494f2b5157123c6cd60e1 author Greg KH Thu, 05 May 2005 11:57:25 -0700 committer Greg KH Tue, 17 May 2005 14:31:12 -0700 [PATCH] PCI: add modalias sysfs file for pci devices Signed-off-by: Greg Kroah-Hartman commit c22610dadc0452b1273494f2b5157123c6cd60e1 tree 150d5315df21f02605ad5a6541ef7cb00176d023 parent 43b7d7cfb157b5c8c5cc0933f4e96fd81adc81ca author Scott Murray Mon, 09 May 2005 17:36:27 -0400 committer Greg KH Tue, 17 May 2005 14:31:11 -0700 [PATCH] PCI Hotplug: remove pci_visit_dev If my CPCI hotplug update patch is applied, then there are no longer any in tree users of the pci_visit_dev API, and it and its related code can be removed. Signed-off-by: Scott Murray Signed-off-by: Greg Kroah-Hartman commit 8b245e45f34280ec61e3c8d643d4613b9e0eb7a4 tree aefa5d7e3d4689f5f1df21a7820088e8d9c7070b parent ee17fd93a5892c162b0a02d58cdfdb9c50cf8467 author Dely Sy Fri, 06 May 2005 17:19:09 -0700 committer Greg KH Tue, 17 May 2005 14:31:11 -0700 [PATCH] PCI Hotplug: get pciehp to work on the downstream port of a switch Here is the updated patch to get pciehp driver to work for downstream port of a switch and handle the difference in the offset value of PCI Express capability list item of different ports. Signed-off-by: Dely Sy Signed-off-by: Greg Kroah-Hartman commit 43b7d7cfb157b5c8c5cc0933f4e96fd81adc81ca tree 2af3b43ed8ee9468b1e0418c10275f33d23ced19 parent 8b245e45f34280ec61e3c8d643d4613b9e0eb7a4 author Scott Murray Mon, 09 May 2005 17:31:50 -0400 committer Greg KH Tue, 17 May 2005 14:31:11 -0700 [PATCH] PCI Hotplug: CPCI update [PATCH] CPCI: update I have finally done some work to update the CompactPCI hotplug driver to fix some of the outstanding issues in 2.6: - Added adapter and latch status ops so that those files will get created by the current PCI hotplug core. This used to not be required, but seems to be now after some of the sysfs rework in the core. - Replaced slot list spinlock with a r/w semaphore to avoid any potential issues with sleeping. This quiets all of the runtime warnings. - Reworked interrupt driven hot extraction handling to remove need for a polling operator for ENUM# status. There are a lot of boards that only have an interrupt driven by ENUM#, so this lowers the bar to entry. - Replaced pci_visit_dev usage with better use of the PCI core functions. The new code is functionally equivalent to the previous code, but the use of pci_enable_device on insert needs to be investigated further, as I need to do some more testing to see if it is still necessary. Signed-off-by: Scott Murray Signed-off-by: Greg Kroah-Hartman commit ee17fd93a5892c162b0a02d58cdfdb9c50cf8467 tree d218eab66a47e883ddf84f5c30e9060cd99394ec parent ff0d2f90fdc4b564d47a7c26b16de81a16cfa28e author Dely Sy Thu, 05 May 2005 11:57:25 -0700 committer Greg KH Tue, 17 May 2005 14:31:10 -0700 [PATCH] PCI Hotplug: Fix echoing 1 to power file of enabled slot problem with SHPC driver Here is a patch to fix the problem of echoing 1 to "power" file to enabled slot causing the slot to power down, and echoing 0 to disabled slot causing shpchp_disabled_slot() to be called twice. This problem was reported by kenji Kaneshige. Thanks, Dely Signed-off-by: Dely Sy Signed-off-by: Greg Kroah-Hartman commit ff0d2f90fdc4b564d47a7c26b16de81a16cfa28e tree 6bb5a1cf91bbda8308ec7e6d900cb89071907dcd parent 8c41a5f50deab01aca11155154d7e6737b3a1d9f author Christoph Lameter Tue, 17 May 2005 08:48:16 -0700 committer Linus Torvalds Tue, 17 May 2005 09:27:05 -0700 [PATCH] fix memory scribble in arch/i386/pci/fixup.c The GET_INDEX() macro should use just the low three bits of the devfn, otherwise we have a memory scribble in pcie_rootport_aspm_quirk that overwrites ptype_all Fix it to be more careful about its arguments while at it. Acked by Dely Sy Signed-off-by: Linus Torvalds commit 8c41a5f50deab01aca11155154d7e6737b3a1d9f tree bdb9b93e9c8ecd0839f1721fb4eea8d63aca481b parent 19bbdf0e510471ecebb3fe09bd8b00773cc63b88 author randy_dunlap Tue, 17 May 2005 07:12:56 -0700 committer Linus Torvalds Tue, 17 May 2005 09:27:05 -0700 [PATCH] update CREDITS free agent Signed-off-by: Randy Dunlap Signed-off-by: Linus Torvalds commit 19bbdf0e510471ecebb3fe09bd8b00773cc63b88 tree 7a90cca66dfb14f29c45dbedcd8c4b8bfa394854 parent ad542ef5b2296fa7a8518e6be67c4588b750d316 author Paul Mackerras Tue, 17 May 2005 16:48:39 +1000 committer Linus Torvalds Tue, 17 May 2005 09:27:05 -0700 [PATCH] ppc32: enable use of early_param We need to call parse_early_param() early on to allow usage of early_param() for command line parsing. Signed-off-by: Kumar Gala Signed-off-by: Paul Mackerras Signed-off-by: Linus Torvalds commit ad542ef5b2296fa7a8518e6be67c4588b750d316 tree e039ed07c5cd2163dee880cb7970a70333c532aa parent ff96b3d4b840e8aa126e0a60fd743417ffdee178 parent f3ac91cf521be4637236d2dcb7ad4aa91f8865f0 author Linus Torvalds Tue, 17 May 2005 08:55:00 -0700 committer Linus Torvalds Tue, 17 May 2005 08:55:00 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-2.6.git commit f3ac91cf521be4637236d2dcb7ad4aa91f8865f0 tree bd6a8c952ca83863e731e93d332a9cdc2a21563e parent 104e50108c862b13da26850d4b469cc13418b66b parent cdcca89e1a90fa9112260bd6384f20fcc4280e21 author Tue, 17 May 2005 11:30:39 -0400 committer Jeff Garzik Tue, 17 May 2005 11:30:39 -0400 Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git commit ff96b3d4b840e8aa126e0a60fd743417ffdee178 tree bf16c711040aa5a00e5a6d6675869526b4dbfbb5 parent b82a96a7f28b9939576bf79a817c7a238d784b47 parent 360b52b08972ada8fd4421e9a7bcbe1ea186c20e author Linus Torvalds Tue, 17 May 2005 08:11:04 -0700 committer Linus Torvalds Tue, 17 May 2005 08:11:04 -0700 Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6.git/ commit b98b79da032584b4c077568d28dde2d2fe226b54 tree a591dcc7f283983732b3536981c467221862611a parent 42dc6617fe41ea65a94399821058353d0b12c0ab author Johannes Stezenbach Mon, 16 May 2005 21:54:47 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:35 -0700 [PATCH] dvb: DST: fixed CI debug output fixed CI debug output (Dominique Dumont) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b82a96a7f28b9939576bf79a817c7a238d784b47 tree 767163e65d1a23fa96ff1a18367f934b2320d3ae parent 43f1a8f8c09aa1e368157039715812139a023d20 author Johannes Stezenbach Mon, 16 May 2005 21:54:49 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:35 -0700 [PATCH] dvb: budget-av: CI fixes - remove enable_ci, ci interface is assumed to be present if the saa7113 is not found. - reduce the delay when checking for saa7113 - clean up the cam reset according to specifications - turn off Vcc to the cam slot if cam is removed or fails reset - remove cam reset in ciintf_init - clean up printks (KERN_) - move gpio setting into saa7113_init - clean up unreadable frontend_init (Kenneth Aafloy) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 43f1a8f8c09aa1e368157039715812139a023d20 tree cdb70fdde5f3f90643e0324f499fa17034ca4956 parent b98b79da032584b4c077568d28dde2d2fe226b54 author Johannes Stezenbach Mon, 16 May 2005 21:54:49 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:35 -0700 [PATCH] dvb: bt8xx: whitespace cleanup whitespace cleanup Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42dc6617fe41ea65a94399821058353d0b12c0ab tree 69fbbd8cd8fd959e03998c956b8c0d9556f14839 parent df481ae59074756f1d0b2712d8b3fe8d04eb16c1 author Johannes Stezenbach Mon, 16 May 2005 21:54:47 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:35 -0700 [PATCH] dvb: DST: fix a bug in the module parameter fix a bug in the module parameter (Dominique Dumont) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit df481ae59074756f1d0b2712d8b3fe8d04eb16c1 tree ad29052455aaf19cead8c24117f5640bf925cb64 parent 4a2cc1269b6c1404e6e882cee604d55c90927467 author Johannes Stezenbach Mon, 16 May 2005 21:54:45 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:34 -0700 [PATCH] dvb: bt8xx: updated documentation updated documentation (Manu Abraham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b46dd4456f87fbad634d9a63d607fc54e4381cb4 tree 676a4c924914065094a6d7d26195a26e8308bada parent 8385e46fbf7c9b80008b915440f256ce88633eeb author Johannes Stezenbach Mon, 16 May 2005 21:54:44 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:34 -0700 [PATCH] dvb: DST: fix for descrambling failure fix for descrambling failure (Dominique Dumont, Manu Abraham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8385e46fbf7c9b80008b915440f256ce88633eeb tree 65104379fb6cc747fe4d53a68380d88124666381 parent e6ac699a4f991e84b4bcdc07d9dfa8e019cf6116 author Johannes Stezenbach Mon, 16 May 2005 21:54:43 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:34 -0700 [PATCH] dvb: DST: fixed tuning problem fixed a tuning problem for cards based on the old firmware (Steffen Motzer, Manu Abraham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4a2cc1269b6c1404e6e882cee604d55c90927467 tree 0035cedefc9f64acb8ca584482a5ba4f130f1313 parent b46dd4456f87fbad634d9a63d607fc54e4381cb4 author Johannes Stezenbach Mon, 16 May 2005 21:54:45 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:34 -0700 [PATCH] dvb: DST: misc. fixes removed unused module parameter session removed unnecesary delay for FTA cards (Manu Abraham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fdc53a6dbfea18e621dd23ed5cfb160837d7ce52 tree 9ce191cdb07264f8c6275c1443e61b465e17d0cb parent 0b3f5a57bf110b519b706365c86ada199075f34e author Johannes Stezenbach Mon, 16 May 2005 21:54:39 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:33 -0700 [PATCH] dvb: modified dvb_register_adapter() to avoid kmalloc/kfree Modified dvb_register_adapter() to avoid kmalloc/kfree. Drivers have to embed struct dvb_adapter into their private data struct from now on. (Andreas Oberritter) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e6ac699a4f991e84b4bcdc07d9dfa8e019cf6116 tree 68d6b10ecae27965aa28cef10ffdf76fe75dd459 parent 50b215a05878ce9636dace6cd21f7e91ff005058 author Johannes Stezenbach Mon, 16 May 2005 21:54:42 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:33 -0700 [PATCH] dvb: DST: add support for Twinhan 200103A add support for the old Twinhan 200103A card (Steffen Motzer) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit daeb6aa40be55b0750aea92dea78b8ebc40ca9a8 tree 25532fb0a65b840a865daf567e195e0a6b314e73 parent fdc53a6dbfea18e621dd23ed5cfb160837d7ce52 author Johannes Stezenbach Mon, 16 May 2005 21:54:40 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:33 -0700 [PATCH] dvb: bt8xx: update documentation update bt8xx documentation (Uwe Bugla) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 50b215a05878ce9636dace6cd21f7e91ff005058 tree 0d3f67aeff9efceb3575dd902d91d21e02638f3d parent daeb6aa40be55b0750aea92dea78b8ebc40ca9a8 author Johannes Stezenbach Mon, 16 May 2005 21:54:41 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:33 -0700 [PATCH] dvb: DST: reorganize Twinhan DST driver to support CI - reorganize Twinhan DST driver to support CI - add support for more cards (Manu Abraham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d91b730dfb46fa889c9c7a67d8bd6596e2ac8b21 tree 181dbb3a05023ab056e1b66d6e6d3b1126fee289 parent 5e9e7226c13135063707a0c82766a2dd748f59e5 author Johannes Stezenbach Mon, 16 May 2005 21:54:38 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:32 -0700 [PATCH] dvb: make needlessly global code static or drop it - make needlessly global code static - #if 0 the following unused global functions: - ttpci/av7110_hw.c: av7110_reset_arm - ttpci/av7110_hw.c: av7110_send_ci_cmd - frontends/mt352.[ch]: drop mt352_read Signed-off-by: Adrian Bunk Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e9e7226c13135063707a0c82766a2dd748f59e5 tree fe942fdad89f9259082a495e3f2d1ac0bd8fd080 parent 71e3420111530273f2b26fabfac4d021c2a2b79f author Johannes Stezenbach Mon, 16 May 2005 21:54:37 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:32 -0700 [PATCH] dvb: dvb-pll.h: prevent multiple inclusion added missing #ifndef and #define to inhibit multiple inclusions (Patrick Boettcher) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b3f5a57bf110b519b706365c86ada199075f34e tree aaf3a3f19d4f122331180d2127764387d7a59dc9 parent d91b730dfb46fa889c9c7a67d8bd6596e2ac8b21 author Johannes Stezenbach Mon, 16 May 2005 21:54:38 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:32 -0700 [PATCH] dvb: frontends: misc. minor cleanups misc. minor cleanups, select FW_LOADER and add a help text to DVB_OR51132 Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dd102c752c17636b2aec7977b377c41156ed19c1 tree 5eba85528af3fb3e34f05f0511c787bbd36d89b8 parent 77b3bd0ccb2fae27e710b921f053ae16f34d70de author Johannes Stezenbach Mon, 16 May 2005 21:54:35 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:31 -0700 [PATCH] dvb: tda1004x: dont use bitfields use simple u8 instead of bitfields (Andreas Oberritter) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 77b3bd0ccb2fae27e710b921f053ae16f34d70de tree f4d34e59ca33b2c9d2ff08b8c5a045b376e569eb parent cd22d5c093faf3b123af33a8a0059f583c6b8cae author Johannes Stezenbach Mon, 16 May 2005 21:54:34 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:31 -0700 [PATCH] dvb: mt352: embed struct mt352_config in mt352_state copying the mt352_config-struct to mt352_state instead of storing just the pointer to it (Patrick Boettcher) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71e3420111530273f2b26fabfac4d021c2a2b79f tree a3482e2868eea3fb19216c43180619097eb2cb29 parent 1dfb800f9d0391dee86d692142745415f5f65f81 author Johannes Stezenbach Mon, 16 May 2005 21:54:36 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:31 -0700 [PATCH] dvb: tda10046: support for different firmware versions added support for different tda10046 firmware versions. tested with v20, v21 and v25. (Andreas Oberritter) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1dfb800f9d0391dee86d692142745415f5f65f81 tree bd4b4adf5a0ee27122b93803323d53981a0b83ba parent dd102c752c17636b2aec7977b377c41156ed19c1 author Johannes Stezenbach Mon, 16 May 2005 21:54:35 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:31 -0700 [PATCH] dvb: tda1004x: allow N_I2C to be overridden by the card driver allow N_I2C to be overridden by the card driver (Andreas Oberritter) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd22d5c093faf3b123af33a8a0059f583c6b8cae tree 4fc387d0e2bd84d06289a029a2fced2a656b87d6 parent b1471c4f67321c09359d6fa8eb5c72c2463db081 author Johannes Stezenbach Mon, 16 May 2005 21:54:33 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:30 -0700 [PATCH] dvb: ves1820: remove unnecessary msleep remove unnecessary msleep(10) in writereg (Tony Glader) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b8742700f13163ffa00cddce2a3c940b9ab2ab5a tree ff82ac83508dc63d0dec63a3479df3b966018b34 parent 591ad98db3be2cd596ac5e0cfba7b164c3bdfb52 author Johannes Stezenbach Mon, 16 May 2005 21:54:31 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:30 -0700 [PATCH] dvb: remove unnecessary casts in frontends remove unnecessary casts in frontends (Kenneth Aafloy) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b1471c4f67321c09359d6fa8eb5c72c2463db081 tree 8bae38bb68c71704351ae036ffcb17a932976be4 parent b8742700f13163ffa00cddce2a3c940b9ab2ab5a author Johannes Stezenbach Mon, 16 May 2005 21:54:32 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:30 -0700 [PATCH] dvb: dib3000: add NULL pointer check prevent NULL pointer related Oopses (Patrick Boettcher) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 591ad98db3be2cd596ac5e0cfba7b164c3bdfb52 tree 93d688cd7a405a0fec635e7c4dc3fa3b05f97f08 parent 7f5e02db4a39c36e68878a14fae1fe7ee6dd6fcf author Johannes Stezenbach Mon, 16 May 2005 21:54:31 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:30 -0700 [PATCH] dvb: stv0299: fix FE_DISHNETWORK_SEND_LEGACY_CMD fix the current stv0299 code that handles FE_DISHNETWORK_SEND_LEGACY_CMD. (supports the legacy SW21, SW44, and SW64 switches) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f5e02db4a39c36e68878a14fae1fe7ee6dd6fcf tree 6e1799614302d89f00e008bc51f5366185b7eebc parent 3a4a571124cdd04215e0f78bc53fe16bab58f32d author Johannes Stezenbach Mon, 16 May 2005 21:54:30 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:29 -0700 [PATCH] dvb: tda1004x: formatting cleanups mostly formatting cleanups, no functional change (Andreas Oberritter) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dbce49ea1c6885d07eb59d12889c059a868e6f5 tree 6d40cad385c0d93ef19de872a1bd7352c5a04cc0 parent 4ab3f08b28676d365f3fb8600ead325fd235711a author Johannes Stezenbach Mon, 16 May 2005 21:54:28 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:29 -0700 [PATCH] dvb: av7110: fix comment fixed debugging instructions: av7110_debug -> debug (Oliver Endirss) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a4a571124cdd04215e0f78bc53fe16bab58f32d tree c1faa0ab53d80ab3f7a00c05b080de72981cd9e8 parent 3165dcb300ff60e794909f02b1fd3a41908682ea author Johannes Stezenbach Mon, 16 May 2005 21:54:29 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:29 -0700 [PATCH] dvb: nxt6000: support frontend status reads add support for read_ber, read_signal_strength and read_status (Greg Wickham) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3165dcb300ff60e794909f02b1fd3a41908682ea tree 7603852e9a66423d551e9296f9b775602790b6a5 parent 3dbce49ea1c6885d07eb59d12889c059a868e6f5 author Johannes Stezenbach Mon, 16 May 2005 21:54:28 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:29 -0700 [PATCH] dvb: av7110: fix indentation fix indentation Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a65d3bb7177cbab1fca69dd97537766c2817b6b2 tree a1219ac6d4e45cfe7b6945d5575a0a5ee4462e9c parent 59142330aaea9d870d795065d8b91e21d5e55254 author Johannes Stezenbach Mon, 16 May 2005 21:54:26 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:28 -0700 [PATCH] dvb: av7110: fix VIDEO_SET_DISPLAY_FORMAT VIDEO_SET_DISPLAY_FORMAT ioctl fixed: set videostate.display_format, not videostate.video_format (Oliver Endriss) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59142330aaea9d870d795065d8b91e21d5e55254 tree cdb5a837b03c8c9a1d8fa0410001a911960366f8 parent 0c53c70f6afa2d3f4d416d8c0e9a219c2f6b7cb6 author Johannes Stezenbach Mon, 16 May 2005 21:54:25 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:28 -0700 [PATCH] dvb: dvb_net: handle IPv6 and LLC/SNAP handle IPv6 and LLC/SNAP (Bertrand Mazieres, Matthieu Castet, Johannes Stezenbach) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4ab3f08b28676d365f3fb8600ead325fd235711a tree 8e6ce9955f45fe22e235088f2e9a8c8696507d1a parent a65d3bb7177cbab1fca69dd97537766c2817b6b2 author Johannes Stezenbach Mon, 16 May 2005 21:54:27 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:28 -0700 [PATCH] dvb: av7110: fix NTSC/PAL switching fix NTSC -> PAL switching (std->id is a bitmap!) (Oliver Endriss) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c53c70f6afa2d3f4d416d8c0e9a219c2f6b7cb6 tree ed3b8a0253d45f1b0a7a80b2aff1a0ee0302f1b9 parent 2d4f2c2e15795b93fa4da7a7cfac5e82df51b1f1 author Johannes Stezenbach Mon, 16 May 2005 21:54:24 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:28 -0700 [PATCH] dvb: remove unnecessary casts in dvb-core remove unnecessary casts in dvb-core (Kenneth Aafloy) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4f009a776c1db9b27346846b0db052e04a6d5ad tree 6a59956b06a0cef47eb17a136b46dfe769d0f811 parent c2c62d81430e907b6599d4be43a7ee6f74d2bd69 author Johannes Stezenbach Mon, 16 May 2005 21:54:21 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:27 -0700 [PATCH] dvb: dvb_frontend: fix module param Remove incorrect "dvb_"-prefix from parameter description. Error detected with section2text.rb, see autoparam patch. Signed-off-by: Magnus Damm Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c2c62d81430e907b6599d4be43a7ee6f74d2bd69 tree ba6132cd5a607cd71bc3910aedb7296a81fe7175 parent 3dfaebdaa2a14c7ca1fbbafff08992489087e7f1 author Johannes Stezenbach Mon, 16 May 2005 21:54:20 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:27 -0700 [PATCH] dvb: saa7146: no need to initialize static/global variables to 0 no need to initialize static/global variables to 0 Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6074b36715f036f56beb688f49a2a2fb5b28ad72 tree 94457efc75de386c7b2d4bf03ec3c8800545b15d parent f4f009a776c1db9b27346846b0db052e04a6d5ad author Johannes Stezenbach Mon, 16 May 2005 21:54:22 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:27 -0700 [PATCH] dvb: av7110: audio out fix Switch analog output of the Crystal sound chip to left/stereo/right mode. This will fix problems with some (most?) channels which do not encode 2-channel audio correctly. (Oliver Endriss) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2d4f2c2e15795b93fa4da7a7cfac5e82df51b1f1 tree 9d1c43edc86b84bc52ddaa0e7df69a74a33ac379 parent 6074b36715f036f56beb688f49a2a2fb5b28ad72 author Johannes Stezenbach Mon, 16 May 2005 21:54:23 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:27 -0700 [PATCH] dvb: add support for KNC-1 cards Support KNC-1 Plus DVB-T and similar KNC-1 cards (Alexander Riedel) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6ee197ccf4af454638c044706f0ba7ef6c1bb76 tree a23c1dc5fc5fda9ce5a3c11b026688add04ec452 parent 59a7ad6c1ed3a058d375d2e679d73805e4f851ac author Johannes Stezenbach Mon, 16 May 2005 21:54:17 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:26 -0700 [PATCH] dvb: flexcop: readme update readme update Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bdc7800122da0b6b008aa9bdafc01e32b6a4576a tree ad6496d10897e3595b8f340497c2091015354bc8 parent c6ee197ccf4af454638c044706f0ba7ef6c1bb76 author Johannes Stezenbach Mon, 16 May 2005 21:54:18 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:26 -0700 [PATCH] dvb: flexcop: i2c read fixes rewrote the i2c-reading-part (no more ack-error ignoring, which was inherited from the skystar2-driver) Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 958706c12d7e1b21ac46a8b3bc7eabb157b20bb7 tree 4bc64aab4f76449c821ad54406d806e2edc1a1cc parent bdc7800122da0b6b008aa9bdafc01e32b6a4576a author Johannes Stezenbach Mon, 16 May 2005 21:54:19 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:26 -0700 [PATCH] dvb: flexcop: DiSeqC fix Fixed DiSeqC switching, which was wrongly taking over from skystar2.c. Thanks to Joerg Riechardt for finding the bug and testing the Fix. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dfaebdaa2a14c7ca1fbbafff08992489087e7f1 tree 19f27bb8a53611863a24a418a931657948325409 parent 958706c12d7e1b21ac46a8b3bc7eabb157b20bb7 author Johannes Stezenbach Mon, 16 May 2005 21:54:19 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:26 -0700 [PATCH] dvb: support for TT/Hauppauge Nexus-S Rev 2.3 Support for TT/Hauppauge Nexus-S Rev 2.3 (Oliver Endriss) Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4ee3fd469302884dda95e1f310d5ffcd9f5acf9 tree 00671eb14e2d6fd77f7f3b521105214845f212e5 parent 4853f16ad881194ec4c49f73287ef1999b2585ea author Johannes Stezenbach Mon, 16 May 2005 21:54:15 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:25 -0700 [PATCH] dvb: flexcop: use hw pid filter - enabled the HW PID by default for the PCI cards - correct the TS demux parsing when PID filter is enabled (and thus the timer IRQ) - rewrote the PID-filter and FULLTS control part in flexcop-hw-filter (thanks to Krzysztof Matula for pointing that out) Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 778241313819e17de3bdf91523c724b4704402c6 tree b0638104fbf6de5a6bfec9ed28d55c33f43e3320 parent 3ed8a31cb387b2ae3e4ca508f973931b61e6f6bd author Johannes Stezenbach Mon, 16 May 2005 21:54:14 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:25 -0700 [PATCH] dvb: flexcop: fix MAC address reading read MAC address directly into dvb_adapter->proposed_mac Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59a7ad6c1ed3a058d375d2e679d73805e4f851ac tree 42e2e23e88ef65f8fd3690e8f9be0a9097200a82 parent c4ee3fd469302884dda95e1f310d5ffcd9f5acf9 author Johannes Stezenbach Mon, 16 May 2005 21:54:16 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:25 -0700 [PATCH] dvb: flexcop: fix module refcount handling Corrected the THIS_MODULE handling for the flexcop-stuff and dvb-usb which lead to oopses because of misorganized module dependencies. Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4853f16ad881194ec4c49f73287ef1999b2585ea tree 6fff14e79a6ec535bc0d3c237d68b4aeea45fe24 parent 778241313819e17de3bdf91523c724b4704402c6 author Johannes Stezenbach Mon, 16 May 2005 21:54:15 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:25 -0700 [PATCH] dvb: flexcop: fixed interrupt-sharing fixed interrupt-sharing and added a spinlock to the irq-callback (thanks to Pascal Riekenberg) Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3ed8a31cb387b2ae3e4ca508f973931b61e6f6bd tree 3091bf6579c6860950ef3e7fa3a532ed2553aa80 parent 7635acd2d927578495c692056d0e7dabd06afc89 author Johannes Stezenbach Mon, 16 May 2005 21:54:13 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:25 -0700 [PATCH] dvb: flexcop: add acknowledgements add acknowledgements Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7635acd2d927578495c692056d0e7dabd06afc89 tree 308c33b31f2c749f12c4ddc9a44211a816e3125b parent 2add87a95068d6457d4e5824d0417d39007665a4 author Johannes Stezenbach Mon, 16 May 2005 21:54:12 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:24 -0700 [PATCH] dvb: flexcop: fix USB transfer handling - driver receives many null TS packets (pid=0x1fff). They occupy the limited USB bandwidth and this leads to loss of video packets. Enabling the null packet filter fixes this. - packets that flexcop sends to USB have a 2 byte header that has to be removed. - sometimes a TS packet is split between different urbs. These parts have to be combined in a temporary buffer. Signed-off-by: Vadim Catana Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6262d062a3fc803d1798365e745b39f4faa04b0e tree fbdfecee03b647a9784a01aad76bdd6dc6bed67b parent 74a01d11c92c06a0ceac88ca306d507a8186e7f6 author Jody McIntyre Mon, 16 May 2005 21:54:05 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:24 -0700 [PATCH] ieee1394: fix premature expiry of async packets Set the initial sendtime to be 10 seconds in the future, to avoid the packet timing out while it's still queued to be sent. This fixes furthur "no tlabel match" problems caused by premature expiry. Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2add87a95068d6457d4e5824d0417d39007665a4 tree f2aa0373421b0bd78ce900a41fa5a72b853e66de parent 1ec359729960f7896db8f642454e603d22519d20 author Johannes Stezenbach Mon, 16 May 2005 21:54:10 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:24 -0700 [PATCH] dvb: b2c2/flexcop driver refactoring part 2: add modular Flexcop driver b2c2/flexcop driver refactoring to support PCI and USB based cards part 2: add modular Flexcop driver Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ec359729960f7896db8f642454e603d22519d20 tree ff6345a3e07cdb319e6ce73b277642894d086c2b parent 6262d062a3fc803d1798365e745b39f4faa04b0e author Johannes Stezenbach Mon, 16 May 2005 21:54:06 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:24 -0700 [PATCH] dvb: b2c2/flexcop driver refactoring part 1: drop old b2c2-usb stuff b2c2/flexcop driver refactoring to support PCI and USB based cards, part 1: drop abandoned attempt to support USB devices Signed-off-by: Patrick Boettcher Signed-off-by: Johannes Stezenbach Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8d98c5cd41d1932bb76a3945b4e8dea889224d87 tree e3a40e8438b5fa34983104167ce6c35179a3e04b parent 2554bd2a68e2c3ca7f2b953fe2860a9e84a5579a author Jody McIntyre Mon, 16 May 2005 21:54:04 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:23 -0700 [PATCH] ieee1394: single buffer fixes to video1394 Apply and fixup patch from Markus Tavenrath for video1394 to allow only a single buffer on receive and two buffers on transmit. Tested with libdc1394 and dvconnect (libdv). Signed-off-by: Dan Dennedy Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74a01d11c92c06a0ceac88ca306d507a8186e7f6 tree b91c62c0092e3e3782af731f47936a75bc9cb776 parent 8d98c5cd41d1932bb76a3945b4e8dea889224d87 author Jody McIntyre Mon, 16 May 2005 21:54:05 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:23 -0700 [PATCH] ieee1394: fix cross_bound check for null ISO packets Fix cross_bound to not return 1 for zero-length regions. Fixes regression when sending null ISO packets. Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 616b859fbd0e59707a24612d5b5fec791156c822 tree 2c58dbdfc262006886ac25a8d56c973b4f6a6772 parent 9ac485dc37b6336c5bf694f9933f43684fd1fd1e author Jody McIntyre Mon, 16 May 2005 21:54:01 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:23 -0700 [PATCH] ieee1394: remove NULL checks for kfree This patch removes redundant NULL pointer checks before kfree() in all of drivers/ieee1394/ Signed-off-by: Jesper Juhl Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2554bd2a68e2c3ca7f2b953fe2860a9e84a5579a tree 862abfd78c5ca1c5badde981c4522225e72f8a16 parent 616b859fbd0e59707a24612d5b5fec791156c822 author Jody McIntyre Mon, 16 May 2005 21:54:03 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:23 -0700 [PATCH] ieee1394: drivers/ieee1394/pcilynx.c: 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() These patches include 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 Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f72cd138e6afc6d93a8e0aacb7e3160cf04d840b tree dfa134859f9c7feb815d3206429235eea172c399 parent a1446c7fb7610a7b417d8b2fadb6751f86ee833e author Jody McIntyre Mon, 16 May 2005 21:53:59 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:22 -0700 [PATCH] ieee1394: drivers/ieee1394/pcilynx.c: remove dead options The options CONFIG_IEEE1394_PCILYNX_LOCALRAM and CONFIG_IEEE1394_PCILYNX_PORTS are not available for some time. Signed-off-by: Adrian Bunk Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1446c7fb7610a7b417d8b2fadb6751f86ee833e tree 6d216852ceb7abc63b3748c9b391886d6e5584f3 parent dfaa9c94b13071c9b5f8578d0ae99acc76c60139 author Jody McIntyre Mon, 16 May 2005 21:53:59 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:22 -0700 [PATCH] ieee1394: feature removal notices drivers/ieee1394 feature removal notices: amdtp, cmp, legacy rawiso interface Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ac485dc37b6336c5bf694f9933f43684fd1fd1e tree d9b3427af250088413712f4ca68dfd8ecc593f8d parent f72cd138e6afc6d93a8e0aacb7e3160cf04d840b author Jody McIntyre Mon, 16 May 2005 21:54:00 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:22 -0700 [PATCH] ieee1394: drivers/ieee1394/ieee1394_transactions.c: possible cleanups This patch contains the following possible cleanups: - #if 0 the following unused global functions: - hpsb_lock - hpsb_send_gasp - ieee1394_transactions.h: remove the stale hpsb_lock64 prototype Signed-off-by: Adrian Bunk Signed-off-by: Jody McIntyre Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dfaa9c94b13071c9b5f8578d0ae99acc76c60139 tree d0ed2827e9c75b9ccb90b5fcc1b854bae51fc44c parent 5418b6925c353c8286651b67fdb8559dd9e54e46 author William Lee Irwin III Mon, 16 May 2005 21:53:58 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:21 -0700 [PATCH] profile.c: `schedule' parsing fix profile=schedule parsing is not quite what it should be. First, str[7] is 'e', not ',', but then even if it did fall through, prof_on = SCHED_PROFILING would be clobbered inside if (get_option(...)) So a small amount of rearrangement is done in this patch to correct it. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit afbf510d47c4009f5d67ec3c0e0b45eb0441bca3 tree 129434483daa8180e35751f231d28045f9e8ead0 parent 24d568ed1b97cb93c2a917cd90296655a8b661a6 author Randy Dunlap Mon, 16 May 2005 21:53:56 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:21 -0700 [PATCH] pcmcia/ds: handle any error code register_chrdev() can return errors (negative) other then -EBUSY, so check for any negative error code. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5418b6925c353c8286651b67fdb8559dd9e54e46 tree cc380fc2fd9af6cf9930bd256f09499ef53915a5 parent afbf510d47c4009f5d67ec3c0e0b45eb0441bca3 author Christoph Hellwig Mon, 16 May 2005 21:53:57 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:21 -0700 [PATCH] kill These days handles everything, no need for an asm header on just two architectures. Signed-off-by: Christoph Hellwig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 24d568ed1b97cb93c2a917cd90296655a8b661a6 tree f31d45cba83e1e5ab1f5d198735159c5b3da823b parent 3407c0fec3456325826c31792e77a80a6dec0e20 author Nishanth Aravamudan Mon, 16 May 2005 21:53:55 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:21 -0700 [PATCH] alpha/osf_sys: use helper functions to convert between tv and jiffies Use helper functions to convert between timeval structure and jiffies rather than custom logic. Signed-off-by: Nishanth Aravamudan Signed-off-by: Domen Puncer Acked-by: Richard Henderson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c64610ba585fabb36be78782868277f3d9741a2e tree e731ee73950ecb6969bb0d7739c03d16373c44c0 parent 3c0547ba8b3bbd8b26ae35e33ac17ff51f67f78c author Andrew Morton Mon, 16 May 2005 21:53:49 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:20 -0700 [PATCH] block_read_full_page() get_block() error handling fix If block_read_full_page() detects an error when running get_block() it will run SetPageError(), then it will zero out the block in pagecache and will mark the buffer_head uptodate. So at the end of readahead we end up with a non-uptodate pagecache page which is marked PageError. But it has uptodate buffers. The pagefault code will run ClearPageError, will launch readpage a second time and block_read_full_page() will notice the uptodate buffers and will mark the page uptodate as well. We end up with an uptodate, !PageError page full of zeros and the error is lost. (It seems a little odd that filemap_nopage() runs ClearPageError(). I guess all of this adds up to meaning that for each attempted access to the page, the pagefault handler will retry the I/O. Which is good and bad. If the app is ignoring SIGBUS for some reason we could get a lot of back-to-back I/O errors.) Fix it by not marking the pagecache buffer_head as uptodate if the attempt to map that buffer to a disk block failed. Credit-to: Qu Fuping For reporting the bug and identifying its source. Signed-off-by: Qu Fuping Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b81074800b98ac50b64d4c8d34e8abf0fda5e3d1 tree 01b5114255fcf1ea8ea15fabe08cc9782131e684 parent c64610ba585fabb36be78782868277f3d9741a2e author Kirill Korotaev Mon, 16 May 2005 21:53:50 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:20 -0700 [PATCH] do_swap_page() can map random data if swap read fails There is a bug in do_swap_page(): when swap page happens to be unreadable, page filled with random data is mapped into user address space. The fix is to check for PageUptodate and send SIGBUS in case of error. Signed-Off-By: Kirill Korotaev Signed-Off-By: Alexey Kuznetsov Acked-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4c443d1b558b21520bd8fd6140b85cee0756becd tree e6d4fea8329bb709efd825ec14c9598a0c08e562 parent b81074800b98ac50b64d4c8d34e8abf0fda5e3d1 author Stephen Smalley Mon, 16 May 2005 21:53:52 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:20 -0700 [PATCH] selinux: fix avc_alloc_node() oom with no policy loaded This patch should fix the avc_alloc_node() oom condition that Andrew reported when no policy is loaded in SELinux. Prior to this patch, when no policy was loaded, the SELinux "security server" (policy engine) was only returning allowed decisions for the requested permissions for each access check. This caused the cache to thrash when trying to use SELinux for real work with no policy loaded (typically, the no policy loaded state is only for bootstrapping to the point where we can load an initial policy). This patch changes the SELinux security server to return the complete allowed access vector at once, and then to reset the cache after the initial policy load to flush the initial cache state created during bootstrapping. Signed-off-by: Stephen Smalley Signed-off-by: James Morris Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3407c0fec3456325826c31792e77a80a6dec0e20 tree 782e7c46235b6de7c775287a786ea7e454058472 parent 4c443d1b558b21520bd8fd6140b85cee0756becd author Yoichi Yuasa Mon, 16 May 2005 21:53:53 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:20 -0700 [PATCH] mips: add resource management to pmu This patch had added resource management to vr41xx's pmu. Signed-off-by: Yoichi Yuasa Cc: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f1fc3990e2ffa14310cae89678c0b4ed1a3f094b tree 48b35624b6787fa0851d7fd1aaa0cd05559f327a parent 4f167fb491725ca0be9df0d76b4b2dd862cdfe0b author Petr Vandrovec Mon, 16 May 2005 21:53:44 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:19 -0700 [PATCH] serial_cs device identification fix serial_cs's vendor/device identification got broken by Yum Rayan's change '[PATCH] serial_cs: Reduce stack usage in serial_event()' - it changed buf type from u_short* to char*, breaking device manufacturer & card number retrieval. Due to this my modem stopped from being recognized as special case. Code will work much better if we'll rely on first_tuple's parser instead of doing parse ourselves. Code also looks simpler after change. Signed-off-by: Petr Vandrovec Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e8f5bdb02ce06925e7fc5916125bdebc533d4299 tree e9baf463f7058f658c63823cf6019bd7317b82cf parent 631330afdf9d29fe84526653674e8e061389d8f6 author Rik van Riel Mon, 16 May 2005 21:53:46 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:19 -0700 [PATCH] Makefile include path ordering The arch Makefile may override the include path order, which is used by Xen (and UML?) to make sure include/asm-xen is searched before include/asm-i386. The Makefile change to 2.6.12-rc4 made the top Makefile always override the value specified by the arch Makefile. This trivial patch makes the Xen kernel compile again. Signed-off-by: Rik van Riel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 631330afdf9d29fe84526653674e8e061389d8f6 tree 0e15f009aaa45bb3bca01f63ffd03b8a63468202 parent f1fc3990e2ffa14310cae89678c0b4ed1a3f094b author Dominik Hackl Mon, 16 May 2005 21:53:45 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:19 -0700 [PATCH] fix Philips SAA7130/7134 TV dependency problem Solve a dependency-problem related to the SAA7130/7134 TV-card driver. The driver won't compile with CRC32 disabled, so I added it to the select list. Signed-off-by: Dominik Hackl Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3c0547ba8b3bbd8b26ae35e33ac17ff51f67f78c tree e1986b120eb889f3a2ebc8887bd3b729880485ff parent e8f5bdb02ce06925e7fc5916125bdebc533d4299 author Matt Mackall Mon, 16 May 2005 21:53:47 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:19 -0700 [PATCH] add_preferred_console() build fix Move add_preferred_console out of CONFIG_PRINTK so serial console does the right thing. Signed-off-by: Matt Mackall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0856009dbaf8eca2269d4129bb83940c0d95054 tree e6c10d133f04ece55250f2fd84fc2b376624b8cd parent ba32311eb73f624a85a5fc2e043cda8e076f86ef author Patrick McHardy Mon, 16 May 2005 21:53:41 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:18 -0700 [PATCH] crypto: fix null encryption/compression null_encrypt() needs to copy the data in case src and dst are disjunct, null_compress() needs to copy the data in any case as far as I can tell. I joined compress/decompress and encrypt/decrypt to avoid duplicating code. Without this patch ESP null_enc packets look like this: IP (tos 0x0, ttl 64, id 23130, offset 0, flags [DF], length: 128) 10.0.0.1 > 10.0.0.2: ESP(spi=0x0f9ca149,seq=0x4) 0x0000: 4500 0080 5a5a 4000 4032 cbef 0a00 0001 E...ZZ@.@2...... 0x0010: 0a00 0002 0f9c a149 0000 0004 0000 0000 .......I........ 0x0020: 0000 0000 0000 0000 0000 0000 0000 0000 ................ 0x0030: 0000 0000 0000 0000 0000 0000 0000 0000 ................ 0x0040: 0000 0000 0000 0000 0000 0000 0000 0000 ................ 0x0050: 0000 .. IP (tos 0x0, ttl 64, id 256, offset 0, flags [DF], length: 128) 10.0.0.2 > 10.0.0.1: ESP(spi=0x0e4f7b51,seq=0x2) 0x0000: 4500 0080 0100 4000 4032 254a 0a00 0002 E.....@.@2%J.... 0x0010: 0a00 0001 0e4f 7b51 0000 0002 a8a8 a8a8 .....O{Q........ 0x0020: a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 ................ 0x0030: a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 ................ 0x0040: a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 a8a8 ................ 0x0050: a8a8 .. Signed-off-by: Patrick McHardy Signed-off-by: Herbert Xu Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ba32311eb73f624a85a5fc2e043cda8e076f86ef tree 1baa53ef8f4b708ec1807ca3a267c713d00da266 parent 59afda786a58f2e8f74a48f2af90534d76d5338d author McMullan, Jason Mon, 16 May 2005 21:53:40 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:18 -0700 [PATCH] swapout oops fix Fix OOPS when swapping on a device that doesn't have an unplug_io_fn defined (eg, ATA Over Ethernet) Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7baeb6a5ccab2d472679a053e64a63ac423c3a42 tree bdc3f674c4d0d82c3e6695f453eeb641a0eea5e6 parent d0856009dbaf8eca2269d4129bb83940c0d95054 author Peter Osterlund Mon, 16 May 2005 21:53:42 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:18 -0700 [PATCH] CDRW/DVD packet writing data corruption fix I found a bug in the packet writing driver that could cause data corruption. The problem arised if the driver got a write request for a sector in a "zone" it was already working on. In that case it was supposed to queue the write request until it was done processing earlier requests for the same zone, and instead work on some other zone in the mean time. However, if there was no other zone to work on, the driver would initiate two packet_data objects for the same zone, causing unpredictable things to happen. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4f167fb491725ca0be9df0d76b4b2dd862cdfe0b tree a4b15758261a9680d7f57530502ade350d99b46f parent 7baeb6a5ccab2d472679a053e64a63ac423c3a42 author Zhang, Yanmin Mon, 16 May 2005 21:53:43 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:18 -0700 [PATCH] spurious interrupt fix On my IA64 machine, after kernel 2.6.12-rc3 boots, an edge-triggered interrupt (IRQ 46) keeps triggered over and over again. There is no IRQ 46 interrupt action handler. It has lots of impact on performance. Kernel 2.6.10 and its prior versions have no the problem. Basically, kernel 2.6.10 will mask the spurious edge interrupt if the interrupt is triggered for the second time and its status includes IRQ_DISABLE|IRQ_PENDING. Originally, IA64 kernel has its own specific _irq_desc definitions in file arch/ia64/kernel/irq.c. The definition initiates _irq_desc[irq].status to IRQ_DISABLE. Since kernel 2.6.11, it was moved to architecture independent codes, i.e. kernel/irq/handle.c, but kernel/irq/handle.c initiates _irq_desc[irq].status to 0 instead of IRQ_DISABLE. Signed-off-by: Zhang Yanmin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a019225c797a1047470accee950d69cfe7c59c5 tree 0292277ce6b1fda86658dbaeeb4402800c2bef0f parent 59db2e6ed080ac385f19b9f4329133d634215bfd author Adrian Bunk Mon, 16 May 2005 21:53:37 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:17 -0700 [PATCH] mm/nommu.c: try to fix __vmalloc Linus changed the second argument of __vmalloc from int to unsigned int breaking the compilation for CONFIG_MMU=n configurations (since he only changed vmalloc.c but not nommu.c). Signed-off-by: Adrian Bunk Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59db2e6ed080ac385f19b9f4329133d634215bfd tree 9924283843873080b34b0950e769f6efe2e8da08 parent 18a2b6471277c9ffbaa14a0c87a11a075eb354bd author Andi Kleen Mon, 16 May 2005 21:53:36 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:17 -0700 [PATCH] x86_64: Update defconfig Update defconfig Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 59afda786a58f2e8f74a48f2af90534d76d5338d tree 24095750e7bbb68675573af6649c814e6f69c4b4 parent 53b21689ba567ad437e4d7917dd9da54a8d6fd5c author Horst Hummel Mon, 16 May 2005 21:53:39 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:17 -0700 [PATCH] s390: dasd set online failure dasd driver changes: - The feature check in dasd_generic_online returns an error if the devmap entry for the device is not yet available. Check for the feature after the device has been created. - Do symmetric registration/deregistration of cdev->handler. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53b21689ba567ad437e4d7917dd9da54a8d6fd5c tree c8cdaab37c1ac04fbf9a8baf01122a55f69ee741 parent 7a019225c797a1047470accee950d69cfe7c59c5 author Adrian Bunk Mon, 16 May 2005 21:53:38 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:17 -0700 [PATCH] drivers/input/keyboard/atkbd.c: fix off by one errors This patch fixes two possible off by one errors found by the Coverity checker (look at the period[i] and delay[j] in the two first unchanged lines). Signed-off-by: Adrian Bunk Cc: Vojtech Pavlik Cc: Dmitry Torokhov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3c5f5e7eeaf7c68ecc1d37200cd1ade0b3da7b9 tree 5d282e1c4aa617d09e3de5423f6662bf1e97bcdd parent 376ec33fcb246fdd7de1696d33739a0fd36f6537 author Andi Kleen Mon, 16 May 2005 21:53:33 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:16 -0700 [PATCH] x86_64: Make vsyscall.c compile without CONFIG_SYSCTL Originally from Matt Tolentino Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 751521149a05e308d863d01ced61080ce1a2ec99 tree cb8312f502b257cc5d9a5a478acf35c5a5821665 parent f3c5f5e7eeaf7c68ecc1d37200cd1ade0b3da7b9 author Andi Kleen Mon, 16 May 2005 21:53:34 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:16 -0700 [PATCH] x86_64: Collected NMI watchdog fixes. Collected NMI watchdog fixes. - Fix call of check_nmi_watchdog - Remove earlier move of check_nmi_watchdog to later. It does not fix the race it was supposed to fix fully. - Remove unused P6 definitions - Add support for performance counter based watchdog on P4 systems. This allows to run it only once per second, which saves some CPU time. Previously it would run at 1000Hz, which was too much. Code ported from i386 Make this the default on Intel systems. - Use check_nmi_watchdog with local APIC based nmi - Fix race in touch_nmi_watchdog - Fix bug that caused incorrect performance counters to be programmed in a few cases on K8. - Remove useless check for local APIC - Use local_t and per_cpu variables for per CPU data. - Keep other CPUs busy during check_nmi_watchdog to make sure they really tick when in lapic mode. - Only check CPUs that are actually online. - Various other fixes. - Fix fallback path when MSRs are unimplemented Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 376ec33fcb246fdd7de1696d33739a0fd36f6537 tree d563f7e14935330e0b6d38ce48f12d15ecea090d parent 3b9ba4d5e23fcab24dd4d2e46dce11f5863869b4 author Suresh Siddha Mon, 16 May 2005 21:53:32 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:16 -0700 [PATCH] x86_64: Fix OEM hpet check Use bitmap_zero instead of bitmap_empty to initialise cpu mask This makes it actually run reliable instead of relying on stack state. Signed-off-by: Suresh Siddha Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18a2b6471277c9ffbaa14a0c87a11a075eb354bd tree fda2050de7a28d40d036dcd02811ba315994a1c2 parent 751521149a05e308d863d01ced61080ce1a2ec99 author Andi Kleen Mon, 16 May 2005 21:53:35 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:16 -0700 [PATCH] x86_64: Don't assume BSP has ID 0 in new smp bootup This patch removes the assumption that LAPIC entries contain the BSP as its first entry. This is a slight improvement to the temporary fix submitted by Suresh Siddha. - Removes assumption that LAPIC entries contain BSP first. - Builds x86_acpiid_to_apicid[] and bios_cpu_apicid[] properly with BSP as first entry. - Made maxcpus=1 boot on these systems. Since the parsing earlier in arch/x86_64/kernel/mpparse.c stopped after maxcpus entries, other entries were not processed, this causes kernel not to boot on these systems. TBD: x86_acpiid_to_apicid and bios_cpu_apicid[] seem to be exactly the same. This could be removed, but might need more work to cleanup. Signed-off-by: Ashok Raj Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f6b8d4778c04148729cc0b0dcd335a4411c44276 tree 04ebfb8aba4f0354a2840886b2d06972faf18a2d parent d1099e8a18960693c04507bdd7b9403db70bfd97 author Andi Kleen Mon, 16 May 2005 21:53:30 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:15 -0700 [PATCH] x86_64: Fix canonical checking for segment registers in ptrace Allowed user programs to set a non canonical segment base, which would cause oopses in the kernel later. Credit-to: Alexander Nyberg For identifying and reporting this bug. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d1099e8a18960693c04507bdd7b9403db70bfd97 tree dab39ccad609234491bd1122f9dcae1f62a7abbc parent 312df5f1a1da780e084b328bcabb02a6dcd044c3 author Andi Kleen Mon, 16 May 2005 21:53:29 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:15 -0700 [PATCH] x86_64: check if ptrace RIP is canonical This works around an AMD Erratum. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3b9ba4d5e23fcab24dd4d2e46dce11f5863869b4 tree 341d4d700cc86b7cfb5343a5ca2a9aed4807e01e parent f6b8d4778c04148729cc0b0dcd335a4411c44276 author Andi Kleen Mon, 16 May 2005 21:53:31 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:15 -0700 [PATCH] x86_64: When checking vmalloc mappings don't use pte_page The PTEs can point to ioremap mappings too, and these are often outside mem_map. The NUMA hash page lookup functions cannot handle out of bounds accesses properly. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 312df5f1a1da780e084b328bcabb02a6dcd044c3 tree 04f0a70177979e4b8924015448a72644f1ce1c79 parent 0af2be0b721997512191e981a051fcb070b87260 author Andi Kleen Mon, 16 May 2005 21:53:28 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:15 -0700 [PATCH] x86_64: Add pmtimer support There are unfortunately more and more multi processor Opteron systems which don't have HPET timer support in the southbridge. This covers in particular Nvidia and VIA chipsets. They also don't guarantee that the TSCs are synchronized between CPUs; and especially with MP powernow the systems are nearly unusable because the time gets very inconsistent between CPUs. The timer code for x86-64 was originally written under the assumption that we could fall back to the HPET timer on such systems. But this doesn't work there. Another alternative is to use the ACPI PM timer as primary time source. This patch does that. The kernel only uses PM timer when there is no other choice because it has some disadvantages. Ported over from i386. It should be faster than the i386 version because I dropped the "read three times" workaround, but is still considerable slower than HPET and also does not work together with vsyscalls which have to be disabled. Cc: Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dda50e716dc9451f40eebfb2902c260e4f62cf34 tree 0012e8cd5d702f8ae8aa7bc3518706054b764806 parent 93ef70a217637ade3f335303a112b22a134a1ec2 author Andi Kleen Mon, 16 May 2005 21:53:25 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:14 -0700 [PATCH] x86_64: Update TSC sync algorithm The new TSC sync algorithm recently submitted did not work too well. The result was that some MP machines where the TSC came up of the BIOS very unsynchronized and that did not have HPET support were nearly unusable because the time would jump forwards and backwards between CPUs. After a lot of research ;-) and some more prototypes I ended up with just using the one from IA64 which looks best. It has some internal self tuning that should adapt to changing interconnect latencies. It holds up in my tests so far. I believe it was originally written by David Mosberger, I just ported it over to x86-64. See the inline comment for a description. This cleans up the code because it uses smp_call_function for syncing instead of having custom hooks in SMP bootup. Please note that the cycle numbers it outputs are too optimistic because they do not take into account the latency of WRMSR and RDTSC, which can be hundreds of cycles. It seems to be able to sync a dual Opteron to 200-300 cycles, which is probably good enough. There is a timing window during AP bootup where interrupts can see inconsistent time before the TSC is synced. It is hard to avoid unfortunately because we can only do the TSC sync after some setup, and we need to enable interrupts before that. I just ignored it for now. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 93ef70a217637ade3f335303a112b22a134a1ec2 tree b5d1e3e603823d798b77a91641f63f10a0a733b1 parent 1f5ee8da005f50d9f46ae5a7edba9a9c2d37b32e author Andi Kleen Mon, 16 May 2005 21:53:24 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:14 -0700 [PATCH] x86_64: Don't look up struct page pointer of physical address in iounmap It could be in a memory hole not mapped in mem_map and that causes the hash lookup to go off to nirvana. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 622dcaf974668f7dee252fc6a8f9a2710c2070f4 tree 482234c3793d1328976a505b54e0425248b29597 parent 2942283e970b357c146ebdcbbcc0bdf5048615ff author Andi Kleen Mon, 16 May 2005 21:53:26 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:14 -0700 [PATCH] x86_64: Don't print the internal k8c+ flag in /proc/cpuinfo It is not very useful to the user and more an kernel internal implementation detail. So hide it. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2942283e970b357c146ebdcbbcc0bdf5048615ff tree 44f6f599f93f85a8bdb550fc7f74838e1d4fd2fd parent dda50e716dc9451f40eebfb2902c260e4f62cf34 author Andi Kleen Mon, 16 May 2005 21:53:26 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:14 -0700 [PATCH] x86_64: Remove x86_apicid field Remove x86_apicid field Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0af2be0b721997512191e981a051fcb070b87260 tree 4076eea98c170fa467d5624e1aaec8254b2b93a0 parent 622dcaf974668f7dee252fc6a8f9a2710c2070f4 author Andi Kleen Mon, 16 May 2005 21:53:27 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:14 -0700 [PATCH] x86_64: Remove unique APIC/IO-APIC ID check It is unnecessary on modern Intel or AMD systems, and that is all we support on x86-64 Also causes problems on various systems Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a158608bf4c6260caf26089b00a000851e11357a tree bccf6f173d6ddcb24aff243573086475b25dfe93 parent 637716a3825e186555361574aa1fa3c0ebf8018b author Andi Kleen Mon, 16 May 2005 21:53:21 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:13 -0700 [PATCH] x86_64/i386: fix defaults for physical/core id in /proc/cpuinfo Last round hopefully of cpu_core_id changes hopefully fow now: - Always initialize cpu_core_id for all CPUs, even when no dual core setup is detected. This prevents funny /proc/cpuinfo output - Do the same with phys_proc_id[] even when no HyperThreading - dito. - Use the CPU APIC-ID from CPUID 1 instead of the linux virtual CPU number to identify the core for AMD dual core setups. Patch for i386/x86-64. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 637716a3825e186555361574aa1fa3c0ebf8018b tree 84401d191be109af6eaf2bbf9ad5ae4b6be1260a parent 10ffdbb8d605be88b148f127ec86452f1364d4f0 author Andi Kleen Mon, 16 May 2005 21:53:20 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:13 -0700 [PATCH] x86_64: Add a guard page at the end of the 47bit address space This works around a bug in the AMD K8 CPUs. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1f5ee8da005f50d9f46ae5a7edba9a9c2d37b32e tree 4abd4f432bd1d8def0992ee55bb00a0d556122d3 parent a158608bf4c6260caf26089b00a000851e11357a author Andi Kleen Mon, 16 May 2005 21:53:22 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:13 -0700 [PATCH] x86_64: Increase number of IO-APICs Needed by big systems and only costs a few K of memory. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 10ffdbb8d605be88b148f127ec86452f1364d4f0 tree c8698c29b1fb07d07f03d98c74f653b75eb20d32 parent ac6b931c44fd9988eaa821c339d54ba06b212412 author Andi Kleen Mon, 16 May 2005 21:53:19 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:13 -0700 [PATCH] x86_64: Readd missing tests in entry.S Cleans up the system exit call slightly and synchronizes with my tree again. Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac6b931c44fd9988eaa821c339d54ba06b212412 tree 3f3c1abe2e53ced6c73c226767faf6fd8d78b2e6 parent 7179906293ebdc333f14a03d3e58b03604848f3c author Andi Kleen Mon, 16 May 2005 21:53:19 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:12 -0700 [PATCH] x86_64: Reduce NMI watchdog stack usage NR_CPUs can be quite big these days. kmalloc the per CPU array instead of putting it onto the stack Signed-off-by: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7a5febe9ffeecd1e78c5b505260ccc1ef18021b4 tree f3d61987a3f961f33a77334052805457a2ef2460 parent 29ac8e056f2016a8404edc02749d095019aa1f82 author NeilBrown Mon, 16 May 2005 21:53:16 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:12 -0700 [PATCH] md: set the unplug_fn and issue_flush_fn for md devices *after* committed to creation We we set the too early, they may still be in place and possibly get called even though the array didn't get set up properly. Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7179906293ebdc333f14a03d3e58b03604848f3c tree 48623522c6af985400e6181ce1b18d98b910c0fc parent 202d182a92c60416680e31baa697faa60b0882f5 author Kirill Korotaev Mon, 16 May 2005 21:53:18 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:12 -0700 [PATCH] mm acct accounting fix This patch fixes mm->total_vm and mm->locked_vm acctounting in case when move_page_tables() fails inside move_vma(). Signed-Off-By: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 202d182a92c60416680e31baa697faa60b0882f5 tree 361fdd4f061791e980ef686c1a914a96e6711c8b parent 7a5febe9ffeecd1e78c5b505260ccc1ef18021b4 author Bjorn Steinbrink Mon, 16 May 2005 21:53:17 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:12 -0700 [PATCH] mm: fix rss counter being incremented when unmapping This patch fixes a bug introduced by the "mm counter operations through macros" patch, which replaced a decrement operation in with an increment macro in try_to_unmap_one(). Signed-off-by: Björn Steinbrink Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a123edab03ac39e08c2f9cb4fc1af07e099c68bc tree 0a6c52add7ac609fd40014888c77f1851d9ab4ee parent 643bdc6fc0e1928f39b4a3f486447024216ca50f author Peter Lundkvist Mon, 16 May 2005 21:53:12 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:11 -0700 [PATCH] Intel 6300ESB TCO timer support Additional i8xx_tco device support. Cc: David Hardeman Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8f332287bc3f2801ba43682fd79baf24dc8ac1ce tree 23644cbab8be5b6f6d3b69d2ef221aecf679fd72 parent 02048817a70ad04dda5b30ad876c42a232229c99 author Paolo 'Blaisorblade' Giarrusso Mon, 16 May 2005 21:53:14 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:11 -0700 [PATCH] uml: change memcpy to memmove Replace one memcpy() call with overlapping source and dest arguments with one call to memmove(), to avoid data corruption. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 29ac8e056f2016a8404edc02749d095019aa1f82 tree e397738144d80b3c3d78edde36ab739892f4d3dc parent 8f332287bc3f2801ba43682fd79baf24dc8ac1ce author NeilBrown Mon, 16 May 2005 21:53:15 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:11 -0700 [PATCH] md: fix splitting of md/linear request that cross a device boundary When a request crosses a boundary between devices, it needs to be split. But where we should calculate the amount of the request before the boundary to find the split-point, we care currently calculating the amount that is *after* the boundary !!! Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02048817a70ad04dda5b30ad876c42a232229c99 tree a3d85d9f43f64bbd8437c973caf98f79d95b5f3e parent a123edab03ac39e08c2f9cb4fc1af07e099c68bc author Paolo 'Blaisorblade' Giarrusso Mon, 16 May 2005 21:53:14 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:11 -0700 [PATCH] uml: remove elf.h Actually remove elf.h in the tree. The previous patch, due to a quilt bug/misuse, left it in the tree as a 0-length file, preventing the build to see it as missing and to generate a symlink in its place. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit baae956100334ffbd101eea5eeea9a5ac9cf3abd tree a34376cb09b394beeff437761094d95b0f7fc28b parent 1ff2c873ca11f9e6abffb004b908756b27597672 author Dmitry Torokhov Mon, 16 May 2005 21:53:09 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:10 -0700 [PATCH] serio 'id' attributes move serio port's id attributes into separate subdirectory: ..devices/serioX/id_type -> ..devices/serioX/id/type ..devices/serioX/id_proto -> ..devices/serioX/id/proto Signed-off-by: Dmitry Torokhov Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64d13c00cf1f7c3d2c1ff449e2a0500ab568d319 tree 864ac985be04cc9434ffc63a7357043c2b46b8a6 parent baae956100334ffbd101eea5eeea9a5ac9cf3abd author Hugh Dickins Mon, 16 May 2005 21:53:09 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:10 -0700 [PATCH] fix impossible VmallocChunk VmallocTotal: 34359738367 kB VmallocUsed: 266288 kB VmallocChunk: 18014366299193295 kB is unsettling - x86_64 and some other architectures keep a separate address range for modules in vmalloc's vmlist, which /proc/meminfo should pass over. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 643bdc6fc0e1928f39b4a3f486447024216ca50f tree 27e360c73ec1eee7205acb19a12b45b1011085d9 parent 64d13c00cf1f7c3d2c1ff449e2a0500ab568d319 author Zhang, Yanmin Mon, 16 May 2005 21:53:11 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:10 -0700 [PATCH] ide proc destroy error Kernel 2.6 has an ide proc destroy error. Run #modprobe ide-core and #rmmod ide-core, then kernel will dump stack information like below. **********Log****************** Badness in remove_proc_entry at fs/proc/generic.c:693 Call Trace: [] show_stack+0x80/0xa0 sp=3De0000003e05dfbe0 = bsp=3De0000003e05d0ea8 [] dump_stack+0x30/0x60 sp=3De0000003e05dfdb0 = bsp=3De0000003e05d0e90 [] remove_proc_entry+0x530/0x540 sp=3De0000003e05dfdb0 = bsp=3De0000003e05d0e20 [] proc_ide_destroy+0x120/0x140 [ide_core] sp=3De0000003e05dfdc0 = bsp=3De0000003e05d0df0 [] cleanup_module+0x50/0xa0 [ide_core] sp=3De0000003e05dfdc0 = bsp=3De0000003e05d0dd0 [] sys_delete_module+0x390/0x580 sp=3De0000003e05dfdc0 = bsp=3De0000003e05d0d50 [] ia64_ret_from_syscall+0x0/0x20 sp=3De0000003e05dfe30 = bsp=3De0000003e05d0d50 [] _stext+0xffffffff00010640/0x400 sp=3De0000003e05e0000 = bsp=3De0000003e05d0d50 Signed-off-by: Zhang Yanmin Cc: Bartlomiej Zolnierkiewicz Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ff2c873ca11f9e6abffb004b908756b27597672 tree 0c231057e7d947882fcb33b5fa277ba08423a70b parent f3a5c73d5ecb40909db662c4d2ace497b25c5940 author Dmitry Torokhov Mon, 16 May 2005 21:53:07 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:10 -0700 [PATCH] serport oops fix serport - avoid calling serio_interrupt or serio_write_wakeup on unregistered port. Also fix memory leak which could happen if serport was left unused by moving serio allocation down to serport_ldisc_read. Signed-off-by: Dmitry Torokhov Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3a5c73d5ecb40909db662c4d2ace497b25c5940 tree 5bfe12968e0cfb13fef2c752712cbf2c5d15bdb9 parent 64b14d375263019753dd1405e4edd91a1715301d author Dmitry Torokhov Mon, 16 May 2005 21:53:06 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:09 -0700 [PATCH] ALPS resume fix ALPS needs to be reset for detection to work reliably when reconnecting. Signed-off-by: Dmitry Torokhov Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 64b14d375263019753dd1405e4edd91a1715301d tree 532b0f540ff3708a8463ce3d267136f93ddb90de parent 0c3f2be423dafb9f914afe85e532e3fffd502fde author Andrew Morton Mon, 16 May 2005 21:53:06 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:09 -0700 [PATCH] alps printk tidy Make the alps printk output look consistent. Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 135255605d089202bec61b4a000ee762e9bc9d9c tree 3cc7fd07868d028bf268b962e934f703013e612b parent 118326e940bdecef6c459d42ccf05256ba86daa7 author Pete Jewell Mon, 16 May 2005 21:53:03 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:09 -0700 [PATCH] Fix for bttv driver (v0.9.15) for Leadtek WinFast VC100 XP capture cards This is a tiny patch that fixes bttv-cards.c so that Leadtek WinFast VC100 XP video capture cards work. I've been advised to post it here after having already posted it to the v4l mailing list. Acked-by: Gerd Knorr Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0c3f2be423dafb9f914afe85e532e3fffd502fde tree 5dd44497a960dc4faf078eaa761f42c0766d11b2 parent 135255605d089202bec61b4a000ee762e9bc9d9c author Dmitry Torokhov Mon, 16 May 2005 21:53:04 -0700 committer Linus Torvalds Tue, 17 May 2005 07:59:09 -0700 [PATCH] serio resume fix serio - do not attempt to immediately disconnect port if resume failed, let kseriod take care of it. Otherwise we may attempt to unregister associated input devices which will generate hotplug events which are not handled well during swsusp. Signed-off-by: Dmitry Torokhov Cc: Vojtech Pavlik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 360b52b08972ada8fd4421e9a7bcbe1ea186c20e tree 06067522d817b8a792176b1076ce5a9d0c216f2b parent 25b6f08e3fa0d84e26a373a205cfdad208b54af7 author Greg KH Tue, 10 May 2005 06:45:10 -0700 committer Greg KH Mon, 16 May 2005 21:44:26 -0700 [PATCH] USB: add modalias sysfs file for usb devices Signed-off-by: Greg Kroah-Hartman commit 25b6f08e3fa0d84e26a373a205cfdad208b54af7 tree 6e444121a2eb7900a9cd3ab0606eb04046bdac2f parent 4756ae5b5234e08150ac089f7d989613948f00e5 author Lonnie Mendez Tue, 10 May 2005 17:09:52 -0500 committer Greg KH Mon, 16 May 2005 21:44:26 -0700 [PATCH] USB: cypress_m8: add support for the DeLorme Earthmate lt-20 This patch adds support for the DeLorme Earthmate lt-20 to the cypress_m8 driver. The device was tested and found to be compatible with the cypress_m8 driver. This is a resend with the complete patch which properly compiles. Adds support for the DeLorme Earthmate lt-20 to the cypress_m8 driver. Signed-off-by: Lonnie Mendez Signed-off-by: Greg Kroah-Hartman commit 80615f81534109a22a732d0328d63ced4432824e tree dddfa2683508d40eb965841169d0ac21435c2cf2 parent d3f0fcec2d50a18a84c4f3dd7683206ed37ca009 author David Brownell Tue, 10 May 2005 06:45:10 -0700 committer Greg KH Mon, 16 May 2005 21:44:25 -0700 [PATCH] USB: usbnet driver fixes Updates to the usbnet driver: - Remove a warning when built with Zaurus support but not CDC Ethernet; just moves an #ifdef to cover more code - Two tweaks to the pseudo-MDLM support: * correctly handle _either_ of the two GUIDs * ignore a padding bit that doesn't seem necessary - Remove ID for one Motorola phone that uses the MDLM stuff. It also updates the Kconfig helptext to make it clearer that the "Zaurus" configuration option supports an increasing (sigh) family of nonstandard peripheral protocols. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 4756ae5b5234e08150ac089f7d989613948f00e5 tree f98447ecbd5dc59446d87c87f4c6ba3cf0708290 parent 80615f81534109a22a732d0328d63ced4432824e author David Brownell Mon, 09 May 2005 17:23:51 -0700 committer Greg KH Mon, 16 May 2005 21:44:25 -0700 [PATCH] USB: ehci suspend must stop timer Force the EHCI watchdog timer off during suspend, in case for some reason it was still running after the root hub suspended. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman commit 118326e940bdecef6c459d42ccf05256ba86daa7 tree 13b1e48f4f3700603ed258c41e9e39978babf5ee parent 68f66feb300423bb9ee5daecb1951af394425a38 author Peter Osterlund Sat, 14 May 2005 00:58:30 -0700 committer Greg KH Mon, 16 May 2005 21:07:31 -0700 [PATCH] Fix root hole in pktcdvd ioctl_by_bdev may only be used INSIDE the kernel. If the "arg" argument refers to memory that is accessed by put_user/get_user in the ioctl function, the memory needs to be in the kernel address space (that's the set_fs(KERNEL_DS) doing in the ioctl_by_bdev). This works on i386 because even with set_fs(KERNEL_DS) the user space memory is still accessible with put_user/get_user. That is not true for s390. In short the ioctl implementation of the pktcdvd device driver is horribly broken. Signed-off-by: Peter Osterlund Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman commit 68f66feb300423bb9ee5daecb1951af394425a38 tree ae5ce87f061f76da06cb78ce5c9cf3c8284fc0fc parent a84a505956f5c795a9ab3d60d97b6b91a27aa571 author Stephen Tweedie Fri, 13 May 2005 23:31:19 -0400 committer Greg KH Mon, 16 May 2005 21:07:21 -0700 [PATCH] Fix root hole in raw device [Patch] Fix raw device ioctl pass-through Raw character devices are supposed to pass ioctls through to the block devices they are bound to. Unfortunately, they are using the wrong function for this: ioctl_by_bdev(), instead of blkdev_ioctl(). ioctl_by_bdev() performs a set_fs(KERNEL_DS) before calling the ioctl, redirecting the user-space buffer access to the kernel address space. This is, needless to say, a bad thing. This was noticed first on s390, where raw IO was non-functioning. The s390 driver config does not actually allow raw IO to be enabled, which was the first part of the problem. Secondly, the s390 kernel address space is distinct from user, causing legal raw ioctls to fail. I've reproduced this on a kernel built with 4G:4G split on x86, which fails in the same way (-EFAULT if the address does not exist kernel-side; returns success without actually populating the user buffer if it does.) The patch below fixes both the config and address-space problems. It's based closely on a patch by Jan Glauber , which has been tested on s390 at IBM. I've tested it on x86 4G:4G (split address space) and x86_64 (common address space). Kernel-address-space access has been assigned CAN-2005-1264. Signed-off-by: Stephen Tweedie Signed-off-by: Dave Jones Signed-off-by: Greg Kroah-Hartman commit a84a505956f5c795a9ab3d60d97b6b91a27aa571 tree 440fdf47fcddf8b0d615667b418981a511d16e30 parent d3f0fcec2d50a18a84c4f3dd7683206ed37ca009 author Greg Kroah-Hartman Wed, 11 May 2005 00:10:44 -0700 committer Greg KH Mon, 16 May 2005 21:07:05 -0700 [PATCH] fix Linux kernel ELF core dump privilege elevation As reported by Paul Starzetz Reference: CAN-2005-1263 Signed-off-by: Greg Kroah-Hartman commit d3f0fcec2d50a18a84c4f3dd7683206ed37ca009 tree 6e56e97c81b5b8c4d556ffd90349e73a885a20dc parent 8711a1b902e691c9b3bbd0d0624f836abe9641ca parent c8920ba041c8934b29370f5d62ab9ea8f147966b author Linus Torvalds Mon, 16 May 2005 20:06:47 -0700 committer Linus Torvalds Mon, 16 May 2005 20:06:47 -0700 Automatic merge of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git commit 8711a1b902e691c9b3bbd0d0624f836abe9641ca tree 588af68788e56f7e0e6132e52c35af4abcdb4c93 parent 768cbfbc5273bad91afe12b81471f563b288118a author Russell King Mon, 16 May 2005 23:36:22 +0100 committer Russell King Mon, 16 May 2005 23:36:22 +0100 [PATCH] ARM: Fix build error Mainline kernels don't have VECTORS_HIGH nor COPYPAGE_MINICACHE yet. Signed-off-by: Russell King commit 768cbfbc5273bad91afe12b81471f563b288118a tree 954b95e1d1af6c21df7c85f265d218e48908e161 parent 2a4a7e02e27b4f542473772d588f81759c209fb3 parent 05ab3014636ff60a319d37cdf37dca594b015eec author Linus Torvalds Mon, 16 May 2005 10:34:52 -0700 committer Linus Torvalds Mon, 16 May 2005 10:34:52 -0700 Automatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git commit 2a4a7e02e27b4f542473772d588f81759c209fb3 tree 9b3f40337525c1bdec6b14936184c9794dcd2356 parent 85bcc13072c54592596c5b41d40d1c6a18b04e19 parent bfd4e0709fb977e64e27d9255be6e7aeadf4fcd4 author Linus Torvalds Mon, 16 May 2005 10:27:11 -0700 committer Linus Torvalds Mon, 16 May 2005 10:27:11 -0700 Automatic merge of master.kernel.org:/home/rmk/linux-2.6-rmk.git commit c8920ba041c8934b29370f5d62ab9ea8f147966b tree 6e0e12acd812f221906289348bc4e08cd1047df6 parent c4cc26d3310a6614a20e32276228a5d44159fc9b author Daniel Andersen Thu, 05 May 2005 15:14:09 -0700 committer Jeff Garzik Mon, 16 May 2005 00:04:29 -0400 [PATCH] wireless: 3CRWE154G72 Kconfig help fix Version 2 of the 3com OfficeConnect 11g Cardbus Card aka 3CRWE154G72 is not supported by the prism54 project. To stop confusion, the kernel documentation should state so as 3com made a good job hiding the version. Signed-off-by: Andrew Morton diff -puN drivers/net/wireless/Kconfig~wireless-3crwe154g72-kconfig-help-fix drivers/net/wireless/Kconfig commit c4cc26d3310a6614a20e32276228a5d44159fc9b tree 35246410bf048fb6a0aa455b272f2a2933dbacad parent 99718699f5746cc365f3a9ab4769568a1da97635 author Jiri Benc Wed, 27 Apr 2005 12:48:56 +0200 committer Jeff Garzik Sun, 15 May 2005 23:18:48 -0400 [PATCH] Typo in tulip driver This patch fixes a typo in tulip driver in 2.6.12-rc3. commit 99718699f5746cc365f3a9ab4769568a1da97635 tree 6f8f9ad590b14514ad88c3478328795148c91e46 parent f7a3aae1723e7ffc9c4fcdb489365da7a3d81255 author Geoff Levand Thu, 14 Apr 2005 11:20:32 -0700 committer Jeff Garzik Sun, 15 May 2005 22:44:26 -0400 [PATCH] {PATCH] Fix IBM EMAC driver ioctl bug Fix IBM EMAC driver ioctl bug. I found IBM EMAC driver bug. So mii-tool command print wrong status. # mii-tool eth0: 10 Mbit, half duplex, no link eth1: 10 Mbit, half duplex, no link I can get correct status on fixed kernel. # mii-tool eth0: negotiated 100baseTx-FD, link okZZ eth1: negotiated 100baseTx-FD, link ok Hiroaki Fuse Signed-off-by: Geoff Levand for CELF commit f7a3aae1723e7ffc9c4fcdb489365da7a3d81255 tree 2c0a93d730060f63670d3e7f130ee12e26b3ed8f parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Al Viro Sun, 03 Apr 2005 09:15:52 +0100 committer Jeff Garzik Sun, 15 May 2005 22:22:32 -0400 [PATCH] drivers/net/wireless enabled by wrong option NET_WIRELESS is only a subset of the stuff in drivers/net/wireless; NET_RADIO is what covers all of them. Signed-off-by: Al Viro commit 4b40033ef110b833986c1a1d958a951b695f9fbc tree 78b9b23eb5469db6762bd761d58bf4ad3531467b parent 4dbc30fb27ac4e647e6efadb382ff7d38c3d368e author Domen Puncer Sun, 15 May 2005 16:01:50 -0700 committer David S. Miller Sun, 15 May 2005 16:01:50 -0700 [SPARC]: Eliminate local MIN/MAX macros in drivers/sbus/char/aurora.c From: Christophe Lucas min/max macros from kernel.h are safe, a lot of handcrafted MIN/MAX are not. Signed-off-by: Christophe Lucas Signed-off-by: Domen Puncer commit cdcca89e1a90fa9112260bd6384f20fcc4280e21 tree 303ddceb3a324067c6a18ec00b8643d313eb71e4 parent 21b1ed74ee3667dcabcba92e486988ea9119a085 author Brett Russ Mon, 28 Mar 2005 15:10:27 -0500 committer Jeff Garzik Sun, 15 May 2005 19:00:51 -0400 [PATCH] libata: flush COMRESET set and clear Updated patch to fix erroneous flush of COMRESET set and missing flush of COMRESET clear. Created a new routine scr_write_flush() to try to prevent this in the future. Also, this patch is based on libata-2.6 instead of the previous libata-dev-2.6 based patch. Signed-off-by: Brett Russ Index: libata-2.6/drivers/scsi/libata-core.c =================================================================== commit 21b1ed74ee3667dcabcba92e486988ea9119a085 tree f4cf281ecf24a3352aebd1231cac6002fd44d82d parent f85bdb9ce9e130ce00f7a91523931fdd8f96f102 author Albert Lee Fri, 29 Apr 2005 17:34:59 +0800 committer Jeff Garzik Sun, 15 May 2005 18:46:59 -0400 [PATCH] libata: Prevent the interrupt handler from completing a command twice Problem: During the libata CD-ROM stress test, sometimes the "BUG: timeout without command" error is seen. Root cause: Unexpected interrupt occurs after the ata_qc_complete() is called, but before the SCSI error handler. The interrupt handler is invoked before the SCSI error handler, and it clears the command by calling ata_qc_complete() again. Later when the SCSI error handler is run, the ata_queued_cmd is already gone, causing the "BUG: timeout without command" error. Changes: - Use the ATA_QCFLAG_ACTIVE flag to prevent the interrupt handler from completing the command twice, before the scsi_error_handler. Signed-off-by: Albert Lee commit f85bdb9ce9e130ce00f7a91523931fdd8f96f102 tree 5a3c4eaf51917d1b0146ee4dafedebf8541f1c46 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author John W. Linville Thu, 12 May 2005 15:49:54 -0400 committer Jeff Garzik Sun, 15 May 2005 18:01:22 -0400 [PATCH] libata: stop setting sdev->host->max_sectors for lba48 drives Avoid changing sdev->host->max_sectors because it can prevent use of non-lba48 drives on other ports of the same adapter. Signed-off-by: Stuart Hayes Signed-off-by: John W. Linville commit bfd4e0709fb977e64e27d9255be6e7aeadf4fcd4 tree f5b1ec32cf9972f47a1f32419c3839c3e4695e28 parent 4ad3a443c9238c8df68f4519049c3c8d80fe62c2 author Ben Dooks Thu, 12 May 2005 19:27:14 +0100 committer Russell King Thu, 12 May 2005 19:27:14 +0100 [PATCH] ARM: 2678/1: S3C2440 - cpu fixes, hdiv divisors and nand dev name Patch from Ben Dooks Fix the setting of hdiv when set to divide-by-2. Thanks to Jeonghoon Yoon for pointing this out. Change name of the NAND device to "s3c2440-nand" as it is not similar enough to the "s3c2410-nand" device. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 9dabf9da18018b99a51334c2ef168019389ed5bf tree b89293a7d31464b0139c42ef0a84ded7f7c189ed parent 70489c88d0b7e5820ac37a039a910bb396e2a4e3 author Ben Dooks Thu, 12 May 2005 19:27:13 +0100 committer Russell King Thu, 12 May 2005 19:27:13 +0100 [PATCH] ARM: 2676/1: S3C2440 - NAND register additions Patch from Ben Dooks Add the register definitions for the s3c2440 NAND controller to the s3c2410 NAND register definitions Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 4ad3a443c9238c8df68f4519049c3c8d80fe62c2 tree eb39723468aa2b9269cfb3440239315940ff69c8 parent 9dabf9da18018b99a51334c2ef168019389ed5bf author Ben Dooks Thu, 12 May 2005 19:27:13 +0100 committer Russell King Thu, 12 May 2005 19:27:13 +0100 [PATCH] ARM: 2677/1: S3C2440 - UPLL frequency doubled Patch from Ben Dooks S3C2440 UPLL is the same as the S3C2410 UPLL, it is only the MPLL which has an extra multiplication factor of 2 in the multiplier. Signed-off-by: Ben Dooks Signed-off-by: Russell King commit 70489c88d0b7e5820ac37a039a910bb396e2a4e3 tree 47f5ad9729469cad40c926af4961611208bdfdc1 parent d7def6c22dfa9f32b3d9e5546a7a6a90c644ff5f author Nicolas Pitre Thu, 12 May 2005 19:27:12 +0100 committer Russell King Thu, 12 May 2005 19:27:12 +0100 [PATCH] ARM: 2680/1: refine TLS reg availability some more again Patch from Nicolas Pitre Not all ARMv6 processors implement the TLS register. Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 104e50108c862b13da26850d4b469cc13418b66b tree 721bd8afde77faededb9464908f340617fd16de0 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Rolf Eike Beer Sun, 27 Mar 2005 08:50:38 -0500 committer Thu, 12 May 2005 12:36:04 -0400 [PATCH] typo fix in drivers/scsi/sata_svw.c comment Add missing brace. commit 4dbc30fb27ac4e647e6efadb382ff7d38c3d368e tree e2fb7329e60be37e17f133a28ab6a5e77007db32 parent e4fdee8e3b41239242a8f421a28736ef8e08ca55 author David S. Miller Wed, 11 May 2005 11:37:00 -0700 committer David S. Miller Wed, 11 May 2005 11:37:00 -0700 [SPARC64]: Add timeouts to streaming buffer synchronization. If some hardware error occurs and the flush flag never updates, we will hang forever in these routines. Add a timeout, and print out a diagnostic if it is reached. Signed-off-by: David S. Miller commit e4fdee8e3b41239242a8f421a28736ef8e08ca55 tree d2040221acc9fbd2f24f7670d0edfaba425d376c parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author David S. Miller Wed, 11 May 2005 11:34:32 -0700 committer David S. Miller Wed, 11 May 2005 11:34:32 -0700 [SUNSAB]: Defer register updates until transmitter is idle. The chip can emit garbage characters if we touch the settings while characters are going out. Signed-off-by: David S. Miller commit d7def6c22dfa9f32b3d9e5546a7a6a90c644ff5f tree bae4cdc4e45905416e0868053d62b3dd4869c047 parent fa4354359f800ef9d68ed644438efd45b559b443 author Sascha Hauer Tue, 10 May 2005 19:01:35 +0100 committer Russell King Tue, 10 May 2005 19:01:35 +0100 [PATCH] ARM: 2666/1: i.MX pwm controller defines Patch from Sascha Hauer This patch adds the defines for the i.MX PWM controller Signed-off-by: Steven Scholz Signed-off-by: Sascha Hauer Signed-off-by: Russell King commit fa4354359f800ef9d68ed644438efd45b559b443 tree 57b8fc85f04cb048ec03d01870c597de82f75535 parent 8d802d28c23122a57d7dddf4886b0486ca183d2d author Nicolas Pitre Tue, 10 May 2005 17:36:29 +0100 committer Russell King Tue, 10 May 2005 17:36:29 +0100 [PATCH] ARM: 2663/2: I can't type Patch from Nicolas Pitre Signed-off-by: Nicolas Pitre Signed-off-by: Russell King commit 8d802d28c23122a57d7dddf4886b0486ca183d2d tree f4727bdf06706deffe9516a531275c6aa63d9dba parent 08ee4e4c5fd3fb0857eeb6a5a0ff66881432e8a3 author Russell King Tue, 10 May 2005 17:31:43 +0100 committer Russell King Tue, 10 May 2005 17:31:43 +0100 [PATCH] ARM: Add V6 aliasing cache flush Add cache flushing support for aliased V6 caches to flush_dcache_page. Signed-off-by: Russell King commit 08ee4e4c5fd3fb0857eeb6a5a0ff66881432e8a3 tree a4c70b10a7bbd4dd5606a5d5122d98fd2c82b229 parent d2bab05ac1f9a2f5ddcd2f3256237e5c47fc127f author Russell King Tue, 10 May 2005 17:30:47 +0100 committer Russell King Tue, 10 May 2005 17:30:47 +0100 [PATCH] ARM: Use top_pmd for V6 copy/clear user_page Remove needless page table walking for v6 page operations. Signed-off-by: Russell King commit d2bab05ac1f9a2f5ddcd2f3256237e5c47fc127f tree a330a8ac155d82bae9a500d28533888dedad4d1e parent c4e1f6f6bf82af89994a0ee760fc5e036c4d3c1f author Russell King Tue, 10 May 2005 14:23:01 +0100 committer Russell King Tue, 10 May 2005 14:23:01 +0100 [PATCH] ARM: Move copy/clear user_page locking into implementation Move the locking for copy_user_page() and clear_user_page() into the implementations which require locking. For simple memcpy/ memset based implementations, the locking is extra overhead which is not necessary, and prevents preemption occuring. Signed-off-by: Russell King commit c4e1f6f6bf82af89994a0ee760fc5e036c4d3c1f tree 64d5168e48eb879cb7452e80b06b7d7eaa6a709c parent 155bb14482cc567761c13b4efc064de400c55e18 author Russell King Tue, 10 May 2005 10:40:19 +0100 committer Russell King Tue, 10 May 2005 10:40:19 +0100 [PATCH] ARM: Add top_pmd, which points at the top-most page table Signed-off-by: Russell King commit 05ab3014636ff60a319d37cdf37dca594b015eec tree d9d948a5ecd5e10cd511ebca328df2ef08d5e076 parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Russell King Mon, 09 May 2005 23:21:59 +0100 committer Russell King Mon, 09 May 2005 23:21:59 +0100 [PATCH] Serial: Add uart_insert_char() Add uart_insert_char(), which handles inserting characters into the flip buffer. This helper function handles the correct semantics for handling overrun in addition to inserting normal characters. Signed-off-by: Russell King commit 155bb14482cc567761c13b4efc064de400c55e18 tree 28c9e8989febe619383ceba4b4115ebaafd847bf parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Russell King Mon, 09 May 2005 20:52:51 +0100 committer Russell King Mon, 09 May 2005 20:52:51 +0100 [PATCH] ARM: Add inline functions to find the pmd from virtual address Add pmd_off() and pmd_off_k() to obtain the pmd pointer for a virtual address, and use them throughout the mm initialisation. Signed-off-by: Russell King commit 85bcc13072c54592596c5b41d40d1c6a18b04e19 tree 1f3fe7a88f37ed72f6cdaf6117f0299caf4ab59a parent 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 author Pierre Ossman Sun, 08 May 2005 19:35:27 +0100 committer Russell King Sun, 08 May 2005 19:35:27 +0100 [PATCH] MMC: wbsd update Updates to the wbsd driver. * Fix to handle DAT3 card detection. * Fixed bug which could cause large writes to stall in FIFO mode. * Plug 'n Play support. In most cases you need ACPI PNP for this to work. * Uses generic DMA API (ISA dependency removed).