commit 42aacfba6c2d1ee773615cfcfce0fe973d1d0f37 tree 1f3b06d516dac26c976cedfc59cd48781b96f86d parent b3eb67a2ab4e14fc6cc035907400b86462d174db parent cf65f1623dd005ddfb1cbba20af3423a6c638dbe author Linus Torvalds Fri, 25 Nov 2005 16:48:48 -0800 committer Linus Torvalds Fri, 25 Nov 2005 16:48:48 -0800 Merge branch 'drm-linus' of master.kernel.org:/pub/scm/linux/kernel/git/airlied/drm-2.6 commit b3eb67a2ab4e14fc6cc035907400b86462d174db tree 43fa70b5edfa86ff8a6367cdcfb7f2a9f46ec2de parent b37b03b7051493c9f9a6b336c9c0f81334885b7d author Trond Myklebust Fri, 25 Nov 2005 17:10:11 -0500 committer Trond Myklebust Fri, 25 Nov 2005 17:11:30 -0500 SUNRPC: Funny looking code in __rpc_purge_upcall In __rpc_purge_upcall (net/sunrpc/rpc_pipe.c), the newer code to clean up the in_upcall list has a typo. Thanks to Vince Busam for spotting this! Signed-off-by: Trond Myklebust commit b37b03b7051493c9f9a6b336c9c0f81334885b7d tree 8bb06ddeb952e4399b94bb556f715edb2dbffd34 parent ff6040667ad5a21fa1090e02941ecefb94ebe32c author Trond Myklebust Fri, 25 Nov 2005 17:10:06 -0500 committer Trond Myklebust Fri, 25 Nov 2005 17:11:29 -0500 NFS: Fix a spinlock recursion inside nfs_update_inode() In cases where the server has gone insane, nfs_update_inode() may end up calling nfs_invalidate_inode(), which again calls stuff that takes the inode->i_lock that we're already holding. In addition, given the sort of things we have in NFS these days that need to be cleaned up on inode release, I'm not sure we should ever be calling make_bad_inode(). Fix up spinlock recursion, and limit nfs_invalidate_inode() to clearing the caches, and marking the inode as being stale. Thanks to Steve Dickson for spotting this. Signed-off-by: Trond Myklebust commit ff6040667ad5a21fa1090e02941ecefb94ebe32c tree 63339e45fefb05ecf23071fb98c5b383972714d4 parent 36f20c6df75d599393d79c7feb6283b20913e3d5 author Trond Myklebust Fri, 25 Nov 2005 17:10:01 -0500 committer Trond Myklebust Fri, 25 Nov 2005 17:11:29 -0500 NFSv4: Fix typo in lock caching When caching locks due to holding a file delegation, we must always check against local locks before sending anything to the server. Signed-off-by: Trond Myklebust commit 36f20c6df75d599393d79c7feb6283b20913e3d5 tree 89b95044fe7342fd585f8ebfb62d816d46dc7f1d parent af95598744a83506063b411d81c4f819bf774f62 author Trond Myklebust Fri, 25 Nov 2005 17:09:57 -0500 committer Trond Myklebust Fri, 25 Nov 2005 17:11:28 -0500 NFSv4: Fix buggy nfs_wait_on_sequence() Signed-off-by: Trond Myklebust commit af95598744a83506063b411d81c4f819bf774f62 tree e0ad781a5c7718bb40f0b0f4cd47ada937f21d7b parent 4ad5bd25683ae3a913efb7d5afb7ddf2b2ef09db parent 9a94c5793a7b44720f19ebb71b636bc9c31b44d8 author Linus Torvalds Fri, 25 Nov 2005 09:42:19 -0800 committer Linus Torvalds Fri, 25 Nov 2005 09:42:19 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge commit 4ad5bd25683ae3a913efb7d5afb7ddf2b2ef09db tree 6c862858201bc45444497265ccfa39e9f43d5819 parent cd0cca7bf5e201dcea5632f78ad9b37cb419a5df parent 551c81e2d32c5867fb592091365d8c37e1509dce author Linus Torvalds Fri, 25 Nov 2005 09:33:53 -0800 committer Linus Torvalds Fri, 25 Nov 2005 09:33:53 -0800 Merge git://oss.sgi.com:8090/oss/git/xfs-2.6 commit 9a94c5793a7b44720f19ebb71b636bc9c31b44d8 tree df25ab16bb1e586d671160dd26d3117aa43d77cf parent 26925c5910ab77fc95b4d8bb6d98780b50ab1e5a author David Gibson Thu, 24 Nov 2005 13:34:56 +1100 committer Paul Mackerras Fri, 25 Nov 2005 22:12:45 +1100 [PATCH] powerpc: More hugepage boundary case fixes Blah. The patch [0] I recently sent fixing errors with in_hugepage_area() and prepare_hugepage_range() for powerpc itself has an off-by-one bug. Furthermore, the related functions touches_hugepage_*_range() and within_hugepage_*_range() are also buggy. Some of the bugs, like those addressed in [0] originated with commit 7d24f0b8a53261709938ffabe3e00f88f6498df9 where we tweaked the semantics of where hugepages are allowed. Other bugs have been there essentially forever, and are due to the undefined behaviour of '<<' with shift counts greater than the type width (LOW_ESID_MASK could return non-zero for high ranges with the right congruences). The good news is that I now have a testsuite which should pick up things like this if they creep in again. [0] "powerpc-fix-for-hugepage-areas-straddling-4gb-boundary" Signed-off-by: David Gibson Signed-off-by: Paul Mackerras commit 26925c5910ab77fc95b4d8bb6d98780b50ab1e5a tree 7d7506b3aedeea4db8b8659f046850db97503a89 parent 55bb239e5464ecde046af3e45052ef06efda6444 parent cd0cca7bf5e201dcea5632f78ad9b37cb419a5df author Paul Mackerras Fri, 25 Nov 2005 22:12:01 +1100 committer Paul Mackerras Fri, 25 Nov 2005 22:12:01 +1100 Merge ../linux-2.6 commit 55bb239e5464ecde046af3e45052ef06efda6444 tree bfd475899fe17a5a8f33c5d350547637393ac1e4 parent 91f14480a55a7487d61c3fb40500380099e0da50 author Stephen Rothwell Tue, 22 Nov 2005 12:05:26 +1100 committer Paul Mackerras Fri, 25 Nov 2005 22:11:23 +1100 [PATCH] powerpc: remove arch/powerpc/include hack for 64 bit With the removal of include/asm-powerpc, we no longer need arch/powerpc/include/asm for the 64 bit build. We also do not need -Iarch/powerpc for the 64 bit build either. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 551c81e2d32c5867fb592091365d8c37e1509dce tree 29d2b0f738a8e40a19fd01960f3ff9bd5e007355 parent e0144ca55391556d781cb1c90fd6f00bb0c20760 author Nathan Scott Fri, 25 Nov 2005 16:42:28 +1100 committer Nathan Scott Fri, 25 Nov 2005 16:42:28 +1100 [XFS] Resolve the xlog_grant_log_space hang, revert inline to macro. SGI-PV: 946205 SGI-Modid: xfs-linux-melb:xfs-kern:24567a Signed-off-by: Nathan Scott commit e0144ca55391556d781cb1c90fd6f00bb0c20760 tree 84d13d9587422eea0adaf03dc38560bcc18c0fb5 parent 6b2cf618cc8445a03640d1e5e36829352e297017 author Nathan Scott Fri, 25 Nov 2005 16:42:22 +1100 committer Nathan Scott Fri, 25 Nov 2005 16:42:22 +1100 [XFS] Fix a case where attr2 format was being used unconditionally. SGI-PV: 941645 SGI-Modid: xfs-linux-melb:xfs-kern:24566a Signed-off-by: Nathan Scott commit 6b2cf618cc8445a03640d1e5e36829352e297017 tree 160734b1718a0d7442132d6568263fa3a167cbe2 parent a4656391b76ed93faed724c5963f033164ee477e author Felix Blyakher Fri, 25 Nov 2005 16:42:13 +1100 committer Nathan Scott Fri, 25 Nov 2005 16:42:13 +1100 [XFS] Tight loop in xfs_finish_reclaim_all prevented the xfslogd to run its queue of IO completion callbacks, thus creating the deadlock between umount and xfslogd. Breaking the loop solves the problem. SGI-PV: 943821 SGI-Modid: xfs-linux-melb:xfs-kern:202363a Signed-off-by: Felix Blyakher Signed-off-by: Nathan Scott commit a4656391b76ed93faed724c5963f033164ee477e tree 25868e009dba991b9e85bbf6eaf102bf9a318056 parent f33c6797bccc695c4c85885f2c676ad4c8fed98d author Nathan Scott Fri, 25 Nov 2005 16:41:57 +1100 committer Nathan Scott Fri, 25 Nov 2005 16:41:57 +1100 [XFS] Fix a 32 bit value wraparound when providing a mapping for a large direct write. SGI-PV: 944820 SGI-Modid: xfs-linux-melb:xfs-kern:24351a Signed-off-by: Nathan Scott commit f33c6797bccc695c4c85885f2c676ad4c8fed98d tree 63e0282c5a773cbf951e80496c5b76ea065763ad parent 55b02d74e126df70fb6b92a0e4e4bed2f0a13fe4 author Christoph Hellwig Fri, 25 Nov 2005 16:41:47 +1100 committer Nathan Scott Fri, 25 Nov 2005 16:41:47 +1100 [XFS] handle error returns from freeze_bdev SGI-PV: 945483 SGI-Modid: xfs-linux-melb:xfs-kern:201884a Signed-off-by: Christoph Hellwig Signed-off-by: Nathan Scott commit 55b02d74e126df70fb6b92a0e4e4bed2f0a13fe4 tree ea82c9ca07b562a92d1f4dc2c819e62256a8a96d parent 33bc227e4e48ddadcf2eacb381c19df338f0a6c8 author Eric Sandeen Fri, 25 Nov 2005 16:41:33 +1100 committer Nathan Scott Fri, 25 Nov 2005 16:41:33 +1100 [XFS] Fix potential overflow in xfs_iomap_t delta for very large extents SGI-PV: 945311 SGI-Modid: xfs-linux-melb:xfs-kern:201708a Signed-off-by: Eric Sandeen Signed-off-by: Nathan Scott commit cd0cca7bf5e201dcea5632f78ad9b37cb419a5df tree 6acc75299ea7a3b9db84e59b8ac268827f397fb2 parent 6d9885a8ce45cd9b7d36517ee823a480eaf95c02 parent 3238c448c6e26d7c26d2e9b070ef149d066cb6c2 author Linus Torvalds Thu, 24 Nov 2005 18:41:59 -0800 committer Linus Torvalds Thu, 24 Nov 2005 18:41:59 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 6d9885a8ce45cd9b7d36517ee823a480eaf95c02 tree e2579aea1ad0c0896d95afd1a0cc28b9c21c97fb parent 33bc227e4e48ddadcf2eacb381c19df338f0a6c8 author Jasper Spaans Thu, 24 Nov 2005 16:53:36 +0100 committer Linus Torvalds Thu, 24 Nov 2005 18:40:34 -0800 [PATCH] fbcon: fix obvious bug in fbcon logo rotation code This code fixes a tiny problem with the recent fbcon rotation changes: fb_prepare_logo doesn't check the return value of fb_find_logo and that causes a crash for my while booting. Obvious & working & tested fix is here. Signed-off-by: Jasper Spaans Acked-by: Antonino Daplas Signed-off-by: Linus Torvalds commit cf65f1623dd005ddfb1cbba20af3423a6c638dbe tree aa1a69092764317ff9ac49c25be5e423882b90d6 parent 33bc227e4e48ddadcf2eacb381c19df338f0a6c8 author Dave Airlie Thu, 24 Nov 2005 21:41:14 +1100 committer Dave Airlie Thu, 24 Nov 2005 21:41:14 +1100 drm: fix quiescent locking A fix for a locking bug which is triggered when a client tries to lock with flag DMA_QUIESCENT (typically the X server), but gets interrupted by a signal. The locking IOCTL should then return an error, but if DMA_QUIESCENT succeeds it returns 0, and the client falsely thinks it has the lock. In addition The client waits for DMA_QUISCENT and possibly DMA_READY without having the lock. From: Thomas Hellstrom Signed-off-by: Dave Airlie commit 33bc227e4e48ddadcf2eacb381c19df338f0a6c8 tree 8671830606ba42f4c68e08eb75d84172964b280e parent 569cfaadb0ea21bfcedac85dbc5147b4a9ed42d2 parent 7655f493b74f3048c02458bc32cd0b144f7b394f author Linus Torvalds Wed, 23 Nov 2005 23:10:47 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:10:47 -0800 Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 commit 569cfaadb0ea21bfcedac85dbc5147b4a9ed42d2 tree 647984adc75b3a82e32b4d117543d09d37665ed6 parent 8dd396ec7bf706fe85d8c6792b478ee6f09e8de6 author Nicolas Kaiser Wed, 23 Nov 2005 15:45:58 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:28 -0800 [PATCH] usb serial: remove redundant include remove redundant include Signed-off-by: Nicolas Kaiser Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 8dd396ec7bf706fe85d8c6792b478ee6f09e8de6 tree 584649c0cdfc75f9facc2219833803dd342191ee parent 63dc3ff3e019287e8cb4647808de1d93acddd006 author Randy Dunlap Wed, 23 Nov 2005 15:45:53 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:28 -0800 [PATCH] USB: kernel-doc for linux/usb.h Fix kernel-doc warning in linux/usb.h. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 63dc3ff3e019287e8cb4647808de1d93acddd006 tree abc7cea2fd8c88f62f7d296b2d56419885807a20 parent 21b1861fb2ba5b25b32c63bc540bbc7ca1d186f8 author David Härdeman Wed, 23 Nov 2005 15:45:49 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:28 -0800 [PATCH] USB: fix USB key generates ioctl_internal_command errors issue On Wed, Nov 16, 2005 at 06:34:24PM -0800, Pete Zaitcev wrote: >On Wed, 16 Nov 2005 23:52:32 +0100, David Härdeman wrote: >> usb-storage: waiting for device to settle before scanning >> Vendor: I0MEGA Model: UMni1GB*IOM2K4 Rev: 1.01 >> Type: Direct-Access ANSI SCSI revision: 02 >> SCSI device sda: 2048000 512-byte hdwr sectors (1049 MB) >> sda: Write Protect is off >> sda: Mode Sense: 00 00 00 00 >> sda: assuming drive cache: write through >> ioctl_internal_command: <8 0 0 0> return code = 8000002 >> : Current: sense key=0x0 >> ASC=0x0 ASCQ=0x0 >> SCSI device sda: 2048000 512-byte hdwr sectors (1049 MB) > >I think it's harmless. I saw things like that, and initially I plugged >them with workarounds like this: Thanks for the pointer, and yes, it is harmless, but it floods the console with the messages which hides other (potentially important) messages...following your example I've made a patch which fixes the problem. Signed-off-by: David Härdeman Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 21b1861fb2ba5b25b32c63bc540bbc7ca1d186f8 tree bb99e3e7d2ff715d9dbee2db6b3c229d75c2365b parent 188075211cc75a31190de4a19a084e3d83ee1c89 author David Brownell Wed, 23 Nov 2005 15:45:42 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:28 -0800 [PATCH] USB: ohci, move ppc asic tweaks nearer pci This should fix a suspend/resume issues that appear with OHCI on some PPC hardware. The PCI layer should doesn't have the hooks needed for such ASIC-specific hooks (in this case, software clock gating), so this moves the code to do that into hcd-pci.c ... where it can be done after the relevant PCI PM state transition (to/from D3). Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 188075211cc75a31190de4a19a084e3d83ee1c89 tree 71649a9b269580f460ad76de4b061741c4a22e23 parent abcc94480634f6fe9fc29b821261e8162c87ddd2 author David Brownell Wed, 23 Nov 2005 15:45:37 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:28 -0800 [PATCH] USB: EHCI updates split init/reinit logic for resume Moving the PCI-specific parts of the EHCI driver into their own file created a few issues ... notably on resume paths which (like swsusp) require re-initializing the controller. This patch: - Splits the EHCI startup code into run-once HCD setup code and separate "init the hardware" reinit code. (That reinit code is a superset of the "early usb handoff" code.) - Then it makes the PCI init code run both, and the resume code only run the reinit code. - It also removes needless pci wrappers around EHCI start/stop methods. - Removes a byteswap issue that would be seen on big-endian hardware. The HCD glue still doesn't actually provide a good way to do all this run-one init stuff in one place though. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit abcc94480634f6fe9fc29b821261e8162c87ddd2 tree 9cede1350b9b26651bc47db292791985aac421d8 parent f03c17fc9abe8582d6ad830290b3093fdf1eea61 author David Brownell Wed, 23 Nov 2005 15:45:32 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:28 -0800 [PATCH] USB: EHCI updates mostly whitespace cleanups This cleans up the recent updates to EHCI PCI support: - Gets rid of checks for "is this a PCI device", they're no longer needed since this is now all PCI-only code. - Reduce log spamming: MWI is only interesting in the atypical case that it can actually be used. - Whitespace cleanup, as appropriate for a new file with no other pending patches. So other than that minor logging change, no functional updates. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit f03c17fc9abe8582d6ad830290b3093fdf1eea61 tree b110f763ddf4043ef1b994ea2f284d02f6039921 parent b4723ae3cc66fd067a8e661b5c05d5bd41be29b5 author David Brownell Wed, 23 Nov 2005 15:45:28 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:28 -0800 [PATCH] USB: EHCI updates This fixes some bugs in EHCI suspend/resume that joined us over the past few releases (as usbcore, PCI, pmcore, and other components evolved): - Removes suspend and resume recursion from the EHCI driver, getting rid of the USB_SUSPEND special casing. - Updates the wakeup mechanism to work again; there's a newish usbcore call it needs to use. - Provide simpler tests for "do we need to restart from scratch", to address another case where PCI Vaux was lost. (In this case it was restoring a swsusp snapshot, but there could be others.) Un-exports a symbol that was temporarily exported. A notable change from previous version is that this doesn't move the spinlock init, so there's still a resume/reinit path bug. Signed-off-by: David Brownell Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit b4723ae3cc66fd067a8e661b5c05d5bd41be29b5 tree b6f011272466928aa1d3db515444d8fc06d3cec6 parent 0b67ba63605a0107f4f3f6d928cdea1e8953fb63 author Ian Abbott Wed, 23 Nov 2005 15:45:23 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:27 -0800 [PATCH] USB: ftdi_sio: new IDs for KOBIL devices This patch adds two new devices to the ftdi_sio driver's device ID table. The device IDs were supplied by Stefan Nies of KOBIL Systems for two of their devices using the FTDI chip. Signed-off-by: Ian Abbott Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 0b67ba63605a0107f4f3f6d928cdea1e8953fb63 tree bba1db4e5c3eaf92fb1b2322463bb8212efb08f8 parent cac1a293469a868fab1ecc2dc1b6441728f7e0e7 author Damian Wrobel Wed, 23 Nov 2005 15:45:17 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:27 -0800 [PATCH] USB: SN9C10x driver - bad page state fix This patch solves the following problem I've already discovered on the latest 2.6.15-rc1-git1 kernel: Nov 13 07:37:28 wrobel kernel: Bad page state at free_hot_cold_page (in process 'motion', page c164e020) Nov 13 07:37:28 wrobel kernel: flags:0x40000400 mapping:00000000 mapcount:0 count:0 Nov 13 07:37:28 wrobel kernel: Backtrace: Nov 13 07:37:28 wrobel kernel: [] bad_page+0x85/0xbe Nov 13 07:37:28 wrobel kernel: [] free_hot_cold_page+0x54/0x129 Nov 13 07:37:28 wrobel kernel: [] __vunmap+0xa9/0xfe Nov 13 07:37:28 wrobel kernel: [] vmalloc_to_page+0x34/0x55 Nov 13 07:37:28 wrobel kernel: [] vfree+0x27/0x35 Nov 13 07:37:28 wrobel kernel: [] sn9c102_release_buffers+0x30/0x3f [sn9c102] Nov 13 07:37:28 wrobel kernel: [] sn9c102_release+0x37/0xeb [sn9c102] Nov 13 07:37:28 wrobel kernel: [] __fput+0xa9/0x1aa Nov 13 07:37:28 wrobel kernel: [] filp_close+0x49/0x6d Nov 13 07:37:30 wrobel kernel: [] sys_close+0x74/0x95 Nov 13 07:37:30 wrobel kernel: [] syscall_call+0x7/0xb Nov 13 07:37:31 wrobel kernel: Trying to fix it up, but a reboot is needed Signed-off-by: Damian Wrobel Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit cac1a293469a868fab1ecc2dc1b6441728f7e0e7 tree 492edaf8192a9c6ca048d3af5bc4b4c3375c2664 parent f366633fc31db1668b4c261e94816d7304ae9810 author Daniel Marjamäki Wed, 23 Nov 2005 15:45:09 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:27 -0800 [PATCH] PCI: direct.c: DBG The DBG() call where updated with the appropriate KERN_* symbol. Signed-off-by: Daniel Marjamäki Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit f366633fc31db1668b4c261e94816d7304ae9810 tree b0fead3c21f62adc948d9038f54260455062ab5d parent ed6d14f9760857c745206c978b80352fc09cfd19 author Randy Dunlap Wed, 23 Nov 2005 15:45:04 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:27 -0800 [PATCH] PCI: kernel-doc fix for pci-acpi.c Fix kernel-doc warning in pci/pci-acpi.c. Signed-off-by: Randy Dunlap Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit ed6d14f9760857c745206c978b80352fc09cfd19 tree 61ac73cfb001362521060d8484d05825e1f20f60 parent 5a49f2036ad14092c11d09f186da86fd5ae49a05 author Rajesh Shah Wed, 23 Nov 2005 15:44:59 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:27 -0800 [PATCH] PCI: remove bogus resource collision error When attempting to hotadd a PCI card with a bridge on it, I saw the kernel reporting resource collision errors even when there were really no collisions. The problem is that the code doesn't skip over "invalid" resources with their resource type flag not set. Others have reported similar problems at boot time and for non-bridge PCI card hotplug too, where the code flags a resource collision for disabled ROMs. This patch fixes both problems. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 5a49f2036ad14092c11d09f186da86fd5ae49a05 tree 75817c2524974df325db97786469e806c4ee546a parent dcb890749bbe63af96163c499e9c86b441fb6c83 author Rajesh Shah Wed, 23 Nov 2005 15:44:54 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:27 -0800 [PATCH] PCI Express Hotplug: clear sticky power-fault bit Per the PCI Express spec, the power-fault-detected bit in the slot status register can be set anytime hardware detects a power fault, regardless of whether the slot has a device populated in it or not. This bit is sticky and must be explicitly cleared. This patch is needed to allow hot-add after such a power fault has been detected. Signed-off-by: Rajesh Shah Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit dcb890749bbe63af96163c499e9c86b441fb6c83 tree bf8c46cf4a0ae6f43dd22ac0f395c3d174fa67c6 parent 657a19ebb74128ec52f20b7e34705bdeadc59400 author Daniel Marjamäkia Wed, 23 Nov 2005 15:44:49 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:27 -0800 [PATCH] PCI: trivial printk updates in common.c Modified common.c so it's using the appropriate KERN_* in printk() calls. Signed-off-by: Daniel Marjamäkia Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 657a19ebb74128ec52f20b7e34705bdeadc59400 tree 96961cb85ac5b3698a552eeb51fee4e6aca99f0d parent 07eab46db7f78b2ed49bc9e41eda80695f93886f author Eugeniy Meshcheryakov Wed, 23 Nov 2005 15:44:35 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:27 -0800 [PATCH] hwmon: hdaps missing an axis Trivial patch to report both hdaps axises to the joystick device, not just the X axis. Signed-off-by: Robert Love Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 07eab46db7f78b2ed49bc9e41eda80695f93886f tree edcde79443d524afd150770ea2f6a1877a858244 parent d0d3cd6965d8e957764663cbb5aaa5ff486a2616 author Jean Delvare Wed, 23 Nov 2005 15:44:31 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:27 -0800 [PATCH] hwmon: Fix missing it87 fan div init Fix a bug where setting the low fan speed limits will not work if no data was ever read through the sysfs interface and the fan clock dividers have not been explicitely set yet either. The reason is that data->fan_div[nr] may currently be used before it is initialized from the chip register values. The fix is to explicitely initialize data->fan_div[nr] before using it. Bug reported, and fix tested, by Nicolas Mailhot. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit d0d3cd6965d8e957764663cbb5aaa5ff486a2616 tree 04faf7ab4ea75656af0621e779e2bc00659a02bc parent 2723ab91cb4019def10bdb01b0fecb85e6ac7884 author Jean Delvare Wed, 23 Nov 2005 15:44:26 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:26 -0800 [PATCH] hwmon: Fix lm78 VID conversion Fix the lm78 VID reading, which I accidentally broke while making this driver use the common vid_from_reg function rather than reimplementing its own in 2.6.14-rc1. I'm not proud of it, trust me. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2723ab91cb4019def10bdb01b0fecb85e6ac7884 tree 753a9a0096bb1e41d79e5ef58370d7cfa8152228 parent 1adc123079207bf9ba5bcf3dbf52bcdb22f82c7c author Yuan Mu Wed, 23 Nov 2005 15:44:21 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:26 -0800 [PATCH] hwmon: Fix missing boundary check when setting W83627THF in0 limits Add SENSORS_LIMIT in store VCore limit functions. This fixes a potential u8 overflow on out-of-range user input. Signed-off-by: Jean Delvare Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 1adc123079207bf9ba5bcf3dbf52bcdb22f82c7c tree 6acd35960bc7e0e3df824c8eed40a4fe87b17a85 parent 50306fb5398f0aac65047c966a4341adee37f512 author Josh Boyer Wed, 23 Nov 2005 15:44:15 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:26 -0800 [PATCH] Add more SCM trees to MAINTAINERS Greg requested a patch to update MAINTAINERS with more SCM entries. The patch below is what I've found so far. Signed-off-by: Josh Boyer Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 50306fb5398f0aac65047c966a4341adee37f512 tree 0a0b93c67da917a186f1aa40b6db0308261b270e parent 2c560ace1531870715fdfdae36fa9d75f4e63ae1 author Jody McIntyre Wed, 23 Nov 2005 15:44:03 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:26 -0800 [PATCH] Clarify T: field in MAINTAINERS Pavel Machek points out that for git repos, what we include is not actually a URL. It is undesirable to use a URL since git repos can be accessed in many different ways. Signed-off-by: Jody McIntyre Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2c560ace1531870715fdfdae36fa9d75f4e63ae1 tree 25d02d2810781c5190189e638b25e4fe6fedfbfd parent 2b08c8d0468866f86da97f836c6ac14338cb81a9 author Josh Boyer Wed, 23 Nov 2005 15:43:57 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:04:26 -0800 [PATCH] MTD git tree location added to MAINTAINERS Here's the MTD one. More later as I find them. Signed-off-by: Josh Boyer Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 2b08c8d0468866f86da97f836c6ac14338cb81a9 tree eca60a3b6811a825cd3642a666aa523a18fe484b parent 133747e8d1e912863edfb3869e36b97b9939d4fc author Alan Stern Wed, 23 Nov 2005 15:43:50 -0800 committer Linus Torvalds Wed, 23 Nov 2005 23:03:06 -0800 [PATCH] Small fixes to driver core This patch (as603) makes a few small fixes to the driver core: Change spin_lock_irq for a klist lock to spin_lock; Fix reference count leaks; Minor spelling and formatting changes. Signed-off-by: Alan Stern Acked-by Patrick Mochel Signed-off-by: Greg Kroah-Hartman Signed-off-by: Linus Torvalds commit 133747e8d1e912863edfb3869e36b97b9939d4fc tree 9ae6c1b39bd3dc08a1a8b4b96ba28be0ed553609 parent de919820cf7fe6674cdf47f8f47d2af284e4309f author Olaf Rempel Wed, 23 Nov 2005 19:04:08 -0800 committer David S. Miller Wed, 23 Nov 2005 19:04:08 -0800 [BRIDGE]: recompute features when adding a new device We must recompute bridge features everytime the list of underlying devices changes, or we might end up with features that are not supported by all devices (eg. NETIF_F_TSO) This patch adds the missing recompute when adding a device to the bridge. Signed-off-by: Olaf Rempel Signed-off-by: David S. Miller commit de919820cf7fe6674cdf47f8f47d2af284e4309f tree 9ee3ef55a57a101faceeeab788816675b4644403 parent 479ef592f3664dd629417098c8599261c0f689ab author Benoit Boissinot Wed, 23 Nov 2005 19:03:46 -0800 committer David S. Miller Wed, 23 Nov 2005 19:03:46 -0800 [NETFILTER]: ip_conntrack_netlink.c needs linux/interrupt.h net/ipv4/netfilter/ip_conntrack_netlink.c: In function 'ctnetlink_dump_table': net/ipv4/netfilter/ip_conntrack_netlink.c:409: warning: implicit declaration of function 'local_bh_disable' net/ipv4/netfilter/ip_conntrack_netlink.c:427: warning: implicit declaration of function 'local_bh_enable' Signed-off-by: Benoit Boissinot Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 479ef592f3664dd629417098c8599261c0f689ab tree 616270b5c79cc3ef5f1fba683f1913f4bea74f47 parent 02b7068221eed702a37527fa2da4d63a27b3126a author Oleg Drokin Wed, 23 Nov 2005 13:37:47 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:39 -0800 [PATCH] 32bit integer overflow in invalidate_inode_pages2() Fix a 32 bit integer overflow in invalidate_inode_pages2_range. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02b7068221eed702a37527fa2da4d63a27b3126a tree 768f217d7eec00364c36d286a11940d3835aba03 parent 5e391dc9e3fec68922137ae317bf680a74656c1b author Andrew Morton Wed, 23 Nov 2005 13:37:47 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:39 -0800 [PATCH] jffs2 debug gcc-2.9x fix Work around gcc-2.95.x macro expansion bug. Cc: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e391dc9e3fec68922137ae317bf680a74656c1b tree 9b262b96fff2f28e85a7e58c9cd69631655b781b parent e9b15b54d3646108bbd3e054158b402025d3e704 author David Gibson Wed, 23 Nov 2005 13:37:45 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:39 -0800 [PATCH] powerpc: fix for hugepage areas straddling 4GB boundary Commit 7d24f0b8a53261709938ffabe3e00f88f6498df9 fixed bugs in the ppc64 SLB miss handler with respect to hugepage handling, and in the process tweaked the semantics of the hugepage address masks in mm_context_t. Unfortunately, it left out a couple of necessary changes to go with that change. First, the in_hugepage_area() macro was not updated to match, second prepare_hugepage_range() was not updated to correctly handle hugepages regions which straddled the 4GB point. The latter appears only to cause process-hangs when attempting to map such a region, but the former can cause oopses if a get_user_pages() is triggered at the wrong point. This patch addresses both bugs. Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e9b15b54d3646108bbd3e054158b402025d3e704 tree 4e12028b9fd62fc13ad66d047f5d0052c2208e96 parent 962b564cf1ec8041e8890a3c3847e3a630a08f42 author Benjamin Herrenschmidt Wed, 23 Nov 2005 13:37:44 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:39 -0800 [PATCH] Fix crash in unregister_console() If unregister_console() is inadvertently called while no consoles are registered, it will crash trying to dereference NULL pointer. It is necessary to fix that because register_console() provides no indication that it actually registered the console passed in. In fact, it may well decide not to register it based on various things... (akpm: It'd be better to make register_console() return something and fix the callers. All 106 of them...) Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 962b564cf1ec8041e8890a3c3847e3a630a08f42 tree a238616355c02496177e486d78f9a75911e943b6 parent 8bf1101bd52573e0573e374d56d2feecdbb5e444 author Oleg Nesterov Wed, 23 Nov 2005 13:37:43 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:39 -0800 [PATCH] fix do_wait() vs exec() race When non-leader thread does exec, de_thread adds old leader to the init's ->children list in EXIT_ZOMBIE state and drops tasklist_lock. This means that release_task(leader) in de_thread() is racy vs do_wait() from init task. I think de_thread() should set old leader's state to EXIT_DEAD instead. Signed-off-by: Oleg Nesterov Cc: george anzinger Cc: Roland Dreier Cc: Ingo Molnar Cc: Linus Torvalds Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8bf1101bd52573e0573e374d56d2feecdbb5e444 tree 235bb46afaee00d5f97090d6e32fb779174d518c parent 7c72aaf29621d29ed19fd68c44edb45321645049 author Jim Keniston Wed, 23 Nov 2005 13:37:42 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:39 -0800 [PATCH] kprobes: Fix return probes on sys_execve Fix a bug in kprobes that can cause an Oops or even a crash when a return probe is installed on one of the following functions: sys_execve, do_execve, load_*_binary, flush_old_exec, or flush_thread. The fix is to remove the call to kprobe_flush_task() in flush_thread(). This fix has been tested on all architectures for which the return-probes feature has been implemented (i386, x86_64, ppc64, ia64). Please apply. BACKGROUND Up to now, we have called kprobe_flush_task() under two situations: when a task exits, and when it execs. Flushing kretprobe_instances on exit is correct because (a) do_exit() doesn't return, and (b) one or more return-probed functions may be active when a task calls do_exit(). Neither is the case for sys_execve() and its callees. Initially, the mistaken call to kprobe_flush_task() on exec was harmless because we put the "real" return address of each active probed function back in the stack, just to be safe, when we recycled its kretprobe_instance. When support for ppc64 and ia64 was added, this safety measure couldn't be employed, and was eventually dropped even for i386 and x86_64. sys_execve() and its callees were informally blacklisted for return probes until this fix was developed. Acked-by: Prasanna S Panchamukhi Signed-off-by: Jim Keniston Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7c72aaf29621d29ed19fd68c44edb45321645049 tree e1d9db94356ccb5276c500659f8abd85942d948c parent 7ce774b4808c019c2f143ff5dea1a1b094ff01e1 author Hugh Dickins Wed, 23 Nov 2005 13:37:40 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:39 -0800 [PATCH] mm: fill arch atomic64 gaps alpha, sparc64, x86_64 are each missing some primitives from their atomic64 support: fill in the gaps I've noticed by extrapolating asm, follow the groupings in each file. But powerpc and parisc still lack atomic64. Signed-off-by: Hugh Dickins Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: "David S. Miller" Cc: Andi Kleen Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ce774b4808c019c2f143ff5dea1a1b094ff01e1 tree 604b9e5395cb70a8cfef0fcb05464dcf3dfdba23 parent 01edcd891c3e9f4bb992ff2ceb69836bf76f8ddf author Hugh Dickins Wed, 23 Nov 2005 13:37:39 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:38 -0800 [PATCH] mm: powerpc init_mm without ptlock Restore an earlier mod which went missing in the powerpc reshuffle: the 4xx mmu_mapin_ram does not need to take init_mm.page_table_lock. Signed-off-by: Hugh Dickins Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01edcd891c3e9f4bb992ff2ceb69836bf76f8ddf tree 3b8ab4808220d1caaf3ba34db16917f71b852a08 parent cc3327e7dfc16a9a3e164075234c869867a59e45 author Hugh Dickins Wed, 23 Nov 2005 13:37:39 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:38 -0800 [PATCH] mm: powerpc ptlock comments Update comments (only) on page_table_lock and mmap_sem in arch/powerpc. Removed the comment on page_table_lock from hash_huge_page: since it's no longer taking page_table_lock itself, it's irrelevant whether others are; but how it is safe (even against huge file truncation?) I can't say. Signed-off-by: Hugh Dickins Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cc3327e7dfc16a9a3e164075234c869867a59e45 tree d120c13540a7fa4769c0bf53eb12628a76366631 parent 7b6ac9dffe6f4dd8776908b234ac1410ed15f112 author Hugh Dickins Wed, 23 Nov 2005 13:37:38 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:38 -0800 [PATCH] mm: unbloat get_futex_key The follow_page changes in get_futex_key have left it with two almost identical blocks, when handling the rare case of a futex in a nonlinear vma. get_user_pages will itself do that follow_page, and its additional find_extend_vma is hardly any overhead since the vma is already cached. Let's just delete the follow_page block and let get_user_pages do it. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7b6ac9dffe6f4dd8776908b234ac1410ed15f112 tree 1e30fde299519eb964899be79560599e04a32a66 parent c101e77301877086e6f977fcfb140d1cbbe23fd5 author Hugh Dickins Wed, 23 Nov 2005 13:37:37 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:38 -0800 [PATCH] mm: update split ptlock Kconfig Closer attention to the arithmetic shows that neither ppc64 nor sparc really uses one page for multiple page tables: how on earth could they, while pte_alloc_one returns just a struct page pointer, with no offset? Well, arm26 manages it by returning a pte_t pointer cast to a struct page pointer, harumph, then compensating in its pmd_populate. But arm26 is never SMP, so it's not a problem for split ptlock either. And the PA-RISC situation has been recently improved: CONFIG_PA20 works without the 16-byte alignment which inflated its spinlock_t. But the current union of spinlock_t with private does make the 7xxx struct page significantly larger, even without debug, so disable its split ptlock. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c101e77301877086e6f977fcfb140d1cbbe23fd5 tree 471198cc41f4e1cb342177934b9ebe9242732e38 parent c2b5a251b9feca727661f1a3278cafb1de4c80f3 author Andrew Morton Wed, 23 Nov 2005 13:37:36 -0800 committer Linus Torvalds Wed, 23 Nov 2005 16:08:38 -0800 [PATCH] revert floppy-fix-read-only-handling This fix causes problems on the very first floppy access - we haven't yet talked to the FDC so we don't know which state the write-protect tab is in. Revert for now. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3238c448c6e26d7c26d2e9b070ef149d066cb6c2 tree 7171ac62a0ebababa54de4128c963e1bf2dac44d parent 1778d55edb62753a92b979fa57072c2e1ff3d062 author Adam Brooks Wed, 23 Nov 2005 22:45:27 +0000 committer Russell King Wed, 23 Nov 2005 22:45:27 +0000 [ARM] 3173/1: Fix to allow 2.6.15-rc2 to compile for IOP3xx boards Patch from Adam Brooks Fixes an issue in 2.6.15-rc2 that prevented compilation of kernels for IOP3xx boards. Signed-off-by: Adam Brooks Signed-off-by: Russell King commit c2b5a251b9feca727661f1a3278cafb1de4c80f3 tree 499369ecd5ef3af4f409df9d86c5e3c5bd4ca2de parent 2d0ebb36038c0626cde662a3b06da9787cfb68c3 author Matthew Wilcox Thu, 03 Nov 2005 07:51:18 -0700 committer Linus Torvalds Wed, 23 Nov 2005 11:11:28 -0800 [PATCH] Check the irq number is within bounds Most of the functions already check. Do the ones that didn't. Signed-off-by: Matthew Wilcox Signed-off-by: Linus Torvalds commit 2d0ebb36038c0626cde662a3b06da9787cfb68c3 tree c4dc4bdf78f50432df16822b1ee01aa2df931e7e parent 1778d55edb62753a92b979fa57072c2e1ff3d062 author Linus Torvalds Wed, 23 Nov 2005 08:44:05 -0800 committer Linus Torvalds Wed, 23 Nov 2005 08:44:05 -0800 Revert "[NET]: Shut up warnings in net/core/flow.c" This reverts commit af2b4079ab154bd12e8c12b02db5f31b31babe63 Changing the #define to an inline function breaks on non-SMP builds, since wuite a few places in the kernel do not implement the ipi handler when compiling for UP. Signed-off-by: Linus Torvalds commit 7655f493b74f3048c02458bc32cd0b144f7b394f tree 7fca7d65df8a2a05caf9aae9a54a6760a75131f4 parent c41f47121d8bf44b886ef2039779dab8c1e3a25f author Dave Airlie Wed, 23 Nov 2005 22:12:59 +1100 committer Dave Airlie Wed, 23 Nov 2005 22:12:59 +1100 drm: move is_pci to the end of the structure We memset the structure across opens except for the flags. The correct fix is more intrusive but this should fix a problem with bad iounmaps seen on AGP radeons acting like PCI ones. Signed-off-by: Dave Airlie commit c41f47121d8bf44b886ef2039779dab8c1e3a25f tree 98fa0962eeec797d266b5936122e52d96839c2ec parent bd07ed2b4d7071716c09895e19849e8b04991656 author Dave Airlie Wed, 23 Nov 2005 22:09:13 +1100 committer Dave Airlie Wed, 23 Nov 2005 22:09:13 +1100 drm: add __GFP_COMP to the drm_alloc_pages The DRM only uses drm_alloc_pages for non-SG PCI cards using DRM. Signed-off-by: Hugh Dickins Signed-off-by: Dave Airlie commit bd07ed2b4d7071716c09895e19849e8b04991656 tree 41aebda6814e358c6afc27b1f00dbe21355e5eaa parent 1778d55edb62753a92b979fa57072c2e1ff3d062 author Dave Airlie Wed, 23 Nov 2005 21:45:43 +1100 committer Dave Airlie Wed, 23 Nov 2005 21:45:43 +1100 I think that if a PCI bus is a root bus, attached to a host bridge not a PCI->PCI bridge, then bus->self is allowed to be NULL. Certainly that's the case on my Pegasos, and it makes the MGA DRM driver oops... Signed-off-by: David Woodhouse Signed-off-by: Dave Airlie commit 91f14480a55a7487d61c3fb40500380099e0da50 tree b455e3f957cd23b595d5761b107d07a1aac5935d parent 1778d55edb62753a92b979fa57072c2e1ff3d062 author Olof Johansson Mon, 21 Nov 2005 02:12:32 -0600 committer Paul Mackerras Wed, 23 Nov 2005 21:23:20 +1100 [PATCH] powerpc: update my email address Email address update, changing old work address to personal (permanent) one. Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit 1778d55edb62753a92b979fa57072c2e1ff3d062 tree ff9ddfae066d2fd97625c3c9c554aa42528507c9 parent ac3461ad632e86e7debd871776683c05ef3ba4c6 author Linus Torvalds Tue, 22 Nov 2005 21:58:37 -0800 committer Linus Torvalds Tue, 22 Nov 2005 21:58:37 -0800 compat-ioctl.c: fix compile with no CONFIG_JBD The ext3 compat-ioctl translation wants to translate data structures that only declared when CONFIG_JBD was enabled. So make play nicely even when we don't actually end up using it. Acked-by: Andrew Morton Acked-by: Jeffrey Hundstad Acked-by: Zan Lynx Signed-off-by: Linus Torvalds commit ac3461ad632e86e7debd871776683c05ef3ba4c6 tree 98ea9272b3e9d05499f1a4fbf10e998f6d476fa5 parent 4b4a27dff4e2d4cc2eac1cde31aede834a966a48 author Linus Torvalds Tue, 22 Nov 2005 19:39:30 -0800 committer Linus Torvalds Tue, 22 Nov 2005 19:39:30 -0800 Fix up GFP_ZONEMASK for GFP_DMA32 usage There was some confusion about the different zone usage, this should fix up the resulting mess in the GFP zonemask handling. The different zone usage is still confusing (it's very easy to mix up the individual zone numbers with the GFP zone _list_ numbers), so we might want to clean up some of this in the future, but in the meantime this should fix the actual problems. Acked-by: Andi Kleen Signed-off-by: Linus Torvalds commit 4b4a27dff4e2d4cc2eac1cde31aede834a966a48 tree 72c387c47d5b6d658f089b16718d9113a278132a parent e6d184e33109010412ad1d59719af74755a935f4 parent a9b1ef8ec7df544b236b19fb6cc42ed2591b65cd author Linus Torvalds Tue, 22 Nov 2005 16:51:33 -0800 committer Linus Torvalds Tue, 22 Nov 2005 16:51:33 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 commit a9b1ef8ec7df544b236b19fb6cc42ed2591b65cd tree b56181ba0c5b72d38c1c75b8780617fa2eacd7c8 parent b3a5225f31180322fd7d692fd4cf786702826b94 author Adrian Bunk Tue, 22 Nov 2005 15:30:29 -0800 committer David S. Miller Tue, 22 Nov 2005 15:30:29 -0800 [SPARC]: drivers/sbus/char/aurora.c: "extern inline" -> "static inline" "extern inline" doesn't make much sense. Signed-off-by: Adrian Bunk Signed-off-by: David S. Miller commit e6d184e33109010412ad1d59719af74755a935f4 tree 50875ca890857b39e8ea4b8521069793d75f0252 parent 00cb277a4a1fb76aafb2fb28aa99f30546e619c5 author Neil Horman Tue, 22 Nov 2005 14:56:32 -0800 committer David S. Miller Tue, 22 Nov 2005 14:56:32 -0800 [NET]: Fix ifenslave to not fail on lack of IP information Patch to ifenslave so that under older ABI versions, a failure to propogate ip information from master to slave does not result in a filure to enslave the slave device. Signed-off-by: Neil Horman Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit 00cb277a4a1fb76aafb2fb28aa99f30546e619c5 tree 8ea9a2434eb55d2ff60bbff3dbc85817a7607493 parent 0ff60a45678e67b2547256a636fd00c1667ce4fa author Pablo Neira Ayuso Tue, 22 Nov 2005 14:54:34 -0800 committer David S. Miller Tue, 22 Nov 2005 14:54:34 -0800 [NETFILTER] ctnetlink: Fix refcount leak ip_conntrack/nat_proto Remove proto == NULL checking since ip_conntrack_[nat_]proto_find_get always returns a valid pointer. Fix missing ip_conntrack_proto_put in some paths. Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 0ff60a45678e67b2547256a636fd00c1667ce4fa tree 664625450d2821c2d22e35e3f9f22192bf41d7d4 parent c27bd492fd84c590767a3c0f9f74e637b17af138 author Jamal Hadi Salim Tue, 22 Nov 2005 14:47:37 -0800 committer David S. Miller Tue, 22 Nov 2005 14:47:37 -0800 [IPV4]: Fix secondary IP addresses after promotion This patch fixes the problem with promoting aliases when: a) a single primary and > 1 secondary addresses b) multiple primary addresses each with at least one secondary address Based on earlier efforts from Brian Pomerantz , Patrick McHardy and Thomas Graf Signed-off-by: Jamal Hadi Salim Signed-off-by: David S. Miller commit c27bd492fd84c590767a3c0f9f74e637b17af138 tree 7a95483c2dbff6a80155a37e893559c2d8e3016f parent af2b4079ab154bd12e8c12b02db5f31b31babe63 author Herbert Xu Tue, 22 Nov 2005 14:41:50 -0800 committer David S. Miller Tue, 22 Nov 2005 14:41:50 -0800 [NETLINK]: Use tgid instead of pid for nlmsg_pid Signed-off-by: Herbert Xu Signed-off-by: David S. Miller commit af2b4079ab154bd12e8c12b02db5f31b31babe63 tree e7ba0f1bc8764c36859e2cfa9421bb1d86f2e7f4 parent b3a5225f31180322fd7d692fd4cf786702826b94 author Russell King Tue, 22 Nov 2005 14:38:04 -0800 committer David S. Miller Tue, 22 Nov 2005 14:38:04 -0800 [NET]: Shut up warnings in net/core/flow.c Not really a network problem, more a !SMP issue. net/core/flow.c:295: warning: statement with no effect flow.c:295: smp_call_function(flow_cache_flush_per_cpu, &info, 1, 0); Fix this by converting the macro to an inline function, which also increases the typechecking for !SMP builds. Signed-off-by: Russell King Signed-off-by: David S. Miller commit b3a5225f31180322fd7d692fd4cf786702826b94 tree 3ee46454260010cb57280bd85beeb3b63e290392 parent 7692c5dd48026d952199c2b97c3418f927cc0407 author Roman Zippel Mon, 21 Nov 2005 21:32:38 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:14:31 -0800 [PATCH] prefer pkg-config for the QT check This makes pkg-config now the prefered way to configure QT and properly fixes the recent Fedora breakage and leaves the old QT detection as fallback mechanism. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7692c5dd48026d952199c2b97c3418f927cc0407 tree f198721b3b65a782ae0ed7400120cc45e0ce87c1 parent 233886dd32ad71daf9c21bf3728c0933a94870f0 author Jonathan E Brassow Mon, 21 Nov 2005 21:32:37 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:14:31 -0800 [PATCH] device-mapper raid1: drop mark_region spinlock fix The spinlock region_lock is held while calling mark_region which can sleep. Drop the spinlock before calling that function. A region's state and inclusion in the clean list are altered by rh_inc and rh_dec. The state variable is set to RH_CLEAN in rh_dec, but only if 'pending' is zero. It is set to RH_DIRTY in rh_inc, but not if it is already so. The changes to 'pending', the state, and the region's inclusion in the clean list need to be atomicly. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 233886dd32ad71daf9c21bf3728c0933a94870f0 tree 4c60f5639c0983a76a43f51917868bce48acc4f9 parent 640eb3b0456f8273726d31160aa24568ae703eec author jblunck@suse.de Mon, 21 Nov 2005 21:32:36 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:14:31 -0800 [PATCH] device-mapper snapshot: bio_list fix bio_list_merge() should do nothing if the second list is empty - not oops. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 640eb3b0456f8273726d31160aa24568ae703eec tree f7c15ae433fb7bb57251c9496de4d3ba91b761e0 parent 0e56822d30184d0da35a6ecc51f38c4ceb457a80 author Stefan Bader Mon, 21 Nov 2005 21:32:35 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:14:31 -0800 [PATCH] device-mapper dm-mpath: endio spinlock fix do_end_io() can be called without interrupts blocked. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0e56822d30184d0da35a6ecc51f38c4ceb457a80 tree a9ee18ce0e724f16dde3c5c97af67fb3a92701f7 parent c4cc66351a24da5feec298be2da59a85f68dd3ea author Alasdair G Kergon Mon, 21 Nov 2005 21:32:34 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:14:31 -0800 [PATCH] device-mapper: mirror log bitset fix The linux bitset operators (test_bit, set_bit etc) work on arrays of "unsigned long". dm-log uses such bitsets but treats them as arrays of uint32_t, only allocating and zeroing a multiple of 4 bytes (as 'clean_bits' is a uint32_t). The patch below fixes this problem. The problem is specific to 64-bit big endian machines such as s390x or ppc-64 and can prevent pvmove terminating. In the simplest case, if "region_count" were (say) 30, then bitset_size (below) would be 4 and bitset_uint32_count would be 1. Thus the memory for this butset, after allocation and zeroing would be 0 0 0 0 X X X X On a bigendian 64bit machine, bit 0 for this bitset is in the 8th byte! (and every bit that dm-log would use would be in the X area). 0 0 0 0 X X X X ^ here which hasn't been cleared properly. As the dm-raid1 code only syncs and counts regions which have a 0 in the 'sync_bits' bitset, and only finishes when it has counted high enough, a large number of 1's among those 'X's will cause the sync to not complete. It is worth noting that the code uses the same bitsets for in-memory and on-disk logs. As these bitsets are host-endian and host-sized, this means that they cannot safely be moved between computers with Signed-off-by: Neil Brown Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c4cc66351a24da5feec298be2da59a85f68dd3ea tree 76b03b0bfa3d6db905b9b7e26997263b01cbe3ee parent b6fcc80d03b41162ed88c3fb542aca9b654bc414 author Alasdair G Kergon Mon, 21 Nov 2005 21:32:33 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:14:31 -0800 [PATCH] device-mapper: list_versions fix In some circumstances the LIST_VERSIONS output is truncated because the size calculation forgets about a 'uint32_t' in each structure - but the inclusion of the whole of ALIGN_MASK frequently compensates for the omission. This is a quick workaround to use an upper bound. (The code ought to be fixed to supply the actual size.) Running 'dmsetup targets' may demonstrate the problem: when I run it, the last line comes out as 'erro' instead of 'error'. Consequently, 'lvcreate --type error' doesn't work. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b6fcc80d03b41162ed88c3fb542aca9b654bc414 tree c716876fbad9a69472e7dd7e92d1e9021e249b91 parent 98766fbe604bc198ced93c57220c2d4a78ad6c11 author Kiyoshi Ueda Mon, 21 Nov 2005 21:32:32 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:14:30 -0800 [PATCH] device-mapper dm-ioctl: missing put in table load error case An error path in table_load() forgets to release a table that won't now be referenced. Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98766fbe604bc198ced93c57220c2d4a78ad6c11 tree 964f630ea0ef6b7ad4c37468955526d09abe4ebd parent 6c52f1377d9cc4bedec5d4e1e3b22756b8978399 author Randy Dunlap Mon, 21 Nov 2005 21:32:31 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:14:30 -0800 [PATCH] kernel Doc/ URL corrections Correct lots of URLs in Documentation/ Also a few minor whitespace cleanups and typo/spello fixes. Sadly there are still a lot of bad URLs remaining. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c52f1377d9cc4bedec5d4e1e3b22756b8978399 tree ac765f9841be4364237ef1012969e4da28a4ef41 parent 79e448bf2d71d52d28c99be4faff9cc51928f90b author Dave Jones Mon, 21 Nov 2005 21:32:30 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:44 -0800 [PATCH] dell_rbu driver depends on x86[64] This driver only appears on IA32 & EM64T boxes. Signed-off-by: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 79e448bf2d71d52d28c99be4faff9cc51928f90b tree b3c8255d2384e7e8d529dc368b42563a0a1f6e0b parent e738cf6d03786486b7e1adbaed1c5c4e14d23626 author Matthew Dobson Mon, 21 Nov 2005 21:32:29 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:44 -0800 [PATCH] Fix a bug in scsi_get_command scsi_get_command() attempts to write into a structure that may not have been successfully allocated. Move this write inside the if statement that ensures we won't panic the kernel with a NULL pointer dereference. Signed-off-by: Matthew Dobson Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e738cf6d03786486b7e1adbaed1c5c4e14d23626 tree b929202b33a993a38110aec3722d8fee75406c32 parent 0bd0f9fb190a0fc0fb25b764c8b04869711f7657 author Grant Coady Mon, 21 Nov 2005 21:32:28 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:44 -0800 [PATCH] cpufreq: silence cpufreq for UP drivers/cpufreq/cpufreq.c: In function `cpufreq_remove_dev': drivers/cpufreq/cpufreq.c:696: warning: unused variable `cpu_sys_dev' Signed-off-by: Grant Coady Cc: Dave Jones Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0bd0f9fb190a0fc0fb25b764c8b04869711f7657 tree 0bd7b58c037b5905cf834f27625bd4e0cbb2f3f2 parent 5ef897c71a8985b62b7ec320a37376daaad364d0 author Eric Paris Mon, 21 Nov 2005 21:32:28 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:43 -0800 [PATCH] hugetlb: fix race in set_max_huge_pages for multiple updaters of nr_huge_pages If there are multiple updaters to /proc/sys/vm/nr_hugepages simultaneously it is possible for the nr_huge_pages variable to become incorrect. There is no locking in the set_max_huge_pages function around alloc_fresh_huge_page which is able to update nr_huge_pages. Two callers to alloc_fresh_huge_page could race against each other as could a call to alloc_fresh_huge_page and a call to update_and_free_page. This patch just expands the area covered by the hugetlb_lock to cover the call into alloc_fresh_huge_page. I'm not sure how we could say that a sysctl section is performance critical where more specific locking would be needed. My reproducer was to run a couple copies of the following script simultaneously while [ true ]; do echo 1000 > /proc/sys/vm/nr_hugepages echo 500 > /proc/sys/vm/nr_hugepages echo 750 > /proc/sys/vm/nr_hugepages echo 100 > /proc/sys/vm/nr_hugepages echo 0 > /proc/sys/vm/nr_hugepages done and then watch /proc/meminfo and eventually you will see things like HugePages_Total: 100 HugePages_Free: 109 After applying the patch all seemed well. Signed-off-by: Eric Paris Acked-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5ef897c71a8985b62b7ec320a37376daaad364d0 tree e3980355964a3fdb6d36e8fdcaf6bb18ea7c31fe parent b4627dea032ab1f6e472fcf030e28f22ea971f9b author Antonino A. Daplas Mon, 21 Nov 2005 21:32:26 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:43 -0800 [PATCH] vgacon: Fix usage of stale height value on vc initialization Reported by: Wayne E. Harlan "[1.] One line summary of the problem: When the kernel option "vga=1" is used, additional tty's (alt+control+Fx with x=2,3,4,5, etc) do not provide the full 50 lines of output. The first one does have 50 lines, however. [2.] Full description of the problem/report: These addtitional tty's show only 39 lines plus the top pixel of the 40-th line. The remaining lines are black and not shown. Kernel version 2.6.13.4 does not show this problem." This bug is caused by using a stale font height value on vgacon_init. Booting with vga=1 gives an 80x50 screen with an 8x8 font. Somewhere during the initialization, the font was changed to 8x9 and the first vc was correctly resized to 80x44. However, the rest of the vc's were not allocated yet, and when they were subsequently initialized, they still used a font height of 8 (instead of 9) causing the mentioned bug. Fix by saving the new font height to vga_video_font_height. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b4627dea032ab1f6e472fcf030e28f22ea971f9b tree cf4a6509616f137e46098bbbb0573194b4ef0af5 parent 74a8a65c526187fe636a6a2abcb7d9ebc5c753ab author Antonino A. Daplas Mon, 21 Nov 2005 21:32:25 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:43 -0800 [PATCH] fbcon: Console Rotation - Fix wrong shift calculation The shift value (amount to shift the bitmap so first pixel starts at origin(0,0)) is incorrect. This causes corrupted characters or a kernel crash if fontwidth is not divisible by 8 at 270 degrees, or fontheight not divisible by 8 at 180 degrees. Report and part of the fix contributed by Knut Petersen. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 74a8a65c526187fe636a6a2abcb7d9ebc5c753ab tree 97900dc68c67eb0d9e2010e34a0c00e27c1ffc1d parent 86e07ce71a8aad5074f7316f9b297d2137630283 author David Gibson Mon, 21 Nov 2005 21:32:24 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:43 -0800 [PATCH] Fix hugetlbfs_statfs() reporting of block limits Currently, if a hugetlbfs is mounted without limits (the default), statfs() will return -1 for max/free/used blocks. This does not appear to be in line with normal convention: simple_statfs() and shmem_statfs() both return 0 in similar cases. Worse, it confuses the translation logic in put_compat_statfs(), causing it to return -EOVERFLOW on such a mount. This patch alters hugetlbfs_statfs() to return 0 for max/free/used blocks on a mount without limits. Note that we need the test in the patch below, rather than just using 0 in the sbinfo structure, because the -1 marked in the free blocks field is used internally to tell the Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 86e07ce71a8aad5074f7316f9b297d2137630283 tree ee1b37dd5bda4868fb3eb0dd34dd446fe73d8141 parent f3d48f0373c14a6203202f7b1dfc7b0d8aaf6ed2 author David Gibson Mon, 21 Nov 2005 21:32:23 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:43 -0800 [PATCH] Fix error handling with put_compat_statfs() In fs/compat.c, whenever put_compat_statfs() returns an error, the containing syscall returns -EFAULT. This is presumably by analogy with the non-compat case, where any non-zero code from copy_to_user() should be translated into an EFAULT. However, put_compat_statfs() is also return -EOVERFLOW. The same applies for put_compat_statfs64(). This bug can be observed with a statfs() on a hugetlbfs directory. hugetlbfs, when mounted without limits reports available, free and total blocks as -1 (itself a bug, another patch coming). statfs() will mysteriously return EFAULT although it's parameters are perfectly valid addresses. This patch causes the compat versions of statfs() and statfs64() to correctly propogate the return values from put_compat_statfs() and put_compat_statfs64(). Signed-off-by: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f3d48f0373c14a6203202f7b1dfc7b0d8aaf6ed2 tree e09198efae7c68b9b4799b0f85d67951cc33bb54 parent 0b0db14c536debd92328819fe6c51a49717e8440 author Hugh Dickins Mon, 21 Nov 2005 21:32:22 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:43 -0800 [PATCH] unpaged: fix sound Bad page states Earlier I unifdefed PageCompound, so that snd_pcm_mmap_control_nopage and others can give out a 0-order component of a higher-order page, which won't be mistakenly freed when zap_pte_range unmaps it. But many Bad page states reported a PG_reserved was freed after all: I had missed that we need to say __GFP_COMP to get compound page behaviour. Some of these higher-order pages are allocated by snd_malloc_pages, some by snd_malloc_dev_pages; or if SBUS, by sbus_alloc_consistent - but that has no gfp arg, so add __GFP_COMP into its sparc32/64 implementations. I'm still rather puzzled that DRM seems not to need a similar change. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b0db14c536debd92328819fe6c51a49717e8440 tree 9fb2df9bc06a30bbc44d980614e441974be55660 parent 689bcebfda16d7bace742740bfb3137fff30b529 author Hugh Dickins Mon, 21 Nov 2005 21:32:20 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:43 -0800 [PATCH] unpaged: copy_page_range vma For copy_one_pte's print_bad_pte to show the task correctly (instead of "???"), dup_mmap must pass down parent vma rather than child vma. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 689bcebfda16d7bace742740bfb3137fff30b529 tree 7a7c1f583ed2c4838244650d83b53557ec1a8efa parent f57e88a8d83de8d844b57e16b84d2f762fe9f092 author Hugh Dickins Mon, 21 Nov 2005 21:32:20 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:42 -0800 [PATCH] unpaged: PG_reserved bad_page It used to be the case that PG_reserved pages were silently never freed, but in 2.6.15-rc1 they may be freed with a "Bad page state" message. We should work through such cases as they appear, fixing the code; but for now it's safer to issue the message without freeing the page, leaving PG_reserved set. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f57e88a8d83de8d844b57e16b84d2f762fe9f092 tree 32fee3ab5c177bc0f47827dd18ad4471be3b2a74 parent ee498ed730283e9cdfc8913f12b90a2246f1a8cc author Hugh Dickins Mon, 21 Nov 2005 21:32:19 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:42 -0800 [PATCH] unpaged: ZERO_PAGE in VM_UNPAGED It's strange enough to be looking out for anonymous pages in VM_UNPAGED areas, let's not insert the ZERO_PAGE there - though whether it would matter will depend on what we decide about ZERO_PAGE refcounting. But whereas do_anonymous_page may (exceptionally) be called on a VM_UNPAGED area, do_no_page should never be: just BUG_ON. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ee498ed730283e9cdfc8913f12b90a2246f1a8cc tree 797966a8454e40fdf1879bacea510ad8c55a91a2 parent 920fc356f58d0e455bdfa53451f1c58eb211a846 author Hugh Dickins Mon, 21 Nov 2005 21:32:18 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:42 -0800 [PATCH] unpaged: anon in VM_UNPAGED copy_one_pte needs to copy the anonymous COWed pages in a VM_UNPAGED area, zap_pte_range needs to free them, do_wp_page needs to COW them: just like ordinary pages, not like the unpaged. But recognizing them is a little subtle: because PageReserved is no longer a condition for remap_pfn_range, we can now mmap all of /dev/mem (whether the distro permits, and whether it's advisable on this or that architecture, is another matter). So if we can see a PageAnon, it may not be ours to mess with (or may be ours from elsewhere in the address space). I suspect there's an entertaining insoluble self-referential problem here, but the page_is_anon function does a good practical job, and MAP_PRIVATE PROT_WRITE VM_UNPAGED will always be an odd choice. In updating the comment on page_address_in_vma, noticed a potential NULL dereference, in a path we don't actually take, but fixed it. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 920fc356f58d0e455bdfa53451f1c58eb211a846 tree cb5fe90bc74ad9dd95191bb3c105aadd833197f2 parent 101d2be7646b7dd1c367d50208a59b29fce61398 author Hugh Dickins Mon, 21 Nov 2005 21:32:17 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:42 -0800 [PATCH] unpaged: COW on VM_UNPAGED Remove the BUG_ON(vma->vm_flags & VM_UNPAGED) from do_wp_page, and let it do Copy-On-Write without touching the VM_UNPAGED's page counts - but this is incomplete, because the anonymous page it inserts will itself need to be handled, here and in other functions - next patch. We still don't copy the page if the pfn is invalid, because the copy_user_highpage interface does not allow it. But that's not been a problem in the past: can be added in later if the need arises. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 101d2be7646b7dd1c367d50208a59b29fce61398 tree 5b01c8a93a749cc776744c71c4f79e95ef5d6393 parent 0b14c179a483e71ea41df2aa4a661760063115bd author Hugh Dickins Mon, 21 Nov 2005 21:32:16 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:42 -0800 [PATCH] unpaged: VM_NONLINEAR VM_RESERVED There's one peculiar use of VM_RESERVED which the previous patch left behind: because VM_NONLINEAR's try_to_unmap_cluster uses vm_private_data as a swapout cursor, but should never meet VM_RESERVED vmas, it was a way of extending VM_NONLINEAR to VM_RESERVED vmas using vm_private_data for some other purpose. But that's an empty set - they don't have the populate function required. So just throw away those VM_RESERVED tests. But one more interesting in rmap.c has to go too: try_to_unmap_one will want to swap out an anonymous page from VM_RESERVED or VM_UNPAGED area. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0b14c179a483e71ea41df2aa4a661760063115bd tree 075fc303a3d2fd33f66c0af8f64064cff2b72b79 parent 664beed0190fae687ac51295694004902ddeb18e author Hugh Dickins Mon, 21 Nov 2005 21:32:15 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:42 -0800 [PATCH] unpaged: VM_UNPAGED Although we tend to associate VM_RESERVED with remap_pfn_range, quite a few drivers set VM_RESERVED on areas which are then populated by nopage. The PageReserved removal in 2.6.15-rc1 changed VM_RESERVED not to free pages in zap_pte_range, without changing those drivers not to set it: so their pages just leak away. Let's not change miscellaneous drivers now: introduce VM_UNPAGED at the core, to flag the special areas where the ptes may have no struct page, or if they have then it's not to be touched. Replace most instances of VM_RESERVED in core mm by VM_UNPAGED. Force it on in remap_pfn_range, and the sparc and sparc64 io_remap_pfn_range. Revert addition of VM_RESERVED to powerpc vdso, it's not needed there. Is it needed anywhere? It still governs the mm->reserved_vm statistic, and special vmas not to be merged, and areas not to be core dumped; but could probably be eliminated later (the drivers are probably specifying it because in 2.4 it kept swapout off the vma, but in 2.6 we work from the LRU, which these pages don't get on). Use the VM_SHM slot for VM_UNPAGED, and define VM_SHM to 0: it serves no purpose whatsoever, and should be removed from drivers when we clean up. Signed-off-by: Hugh Dickins Acked-by: William Irwin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 664beed0190fae687ac51295694004902ddeb18e tree 89a7c8d9d541fb678c567834cb758fc88b375d47 parent 1cdca61bf8537043edde8ef784ce1a1351361dac author Hugh Dickins Mon, 21 Nov 2005 21:32:14 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:42 -0800 [PATCH] unpaged: unifdefed PageCompound It looks like snd_xxx is not the only nopage to be using PageReserved as a way of holding a high-order page together: which no longer works, but is masked by our failure to free from VM_RESERVED areas. We cannot fix that bug without first substituting another way to hold the high-order page together, while farming out the 0-order pages from within it. That's just what PageCompound is designed for, but it's been kept under CONFIG_HUGETLB_PAGE. Remove the #ifdefs: which saves some space (out- of-line put_page), doesn't slow down what most needs to be fast (already using hugetlb), and unifies the way we handle high-order pages. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1cdca61bf8537043edde8ef784ce1a1351361dac tree db9d45f8616240758cea40f5f657879f47f058fe parent 83e9b7e929d1323b9a155d186f77aa8c06155cc3 author Hugh Dickins Mon, 21 Nov 2005 21:32:13 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:42 -0800 [PATCH] unpaged: sound nopage get_page Something noticed when studying use of VM_RESERVED in different drivers: snd_usX2Y_hwdep_pcm_vm_nopage omitted to get_page: fixed. And how did this work before? Aargh! That nopage is returning a page from within a buffer allocated by snd_malloc_pages, which allocates a high-order page, then does SetPageReserved on each 0-order page within. That would have worked in 2.6.14, because when the area was unmapped, PageReserved inhibited put_page. 2.6.15-rc1 removed that inhibition (while leaving ineffective PageReserveds around for now), but it hasn't caused trouble because.. we've not been freeing from VM_RESERVED at all. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 83e9b7e929d1323b9a155d186f77aa8c06155cc3 tree 3cad39e867ca337b08bc4a7309c2b17787abd527 parent ed5297a94090d9a9f27b0ce1f9601ebe73561cff author Hugh Dickins Mon, 21 Nov 2005 21:32:12 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:42 -0800 [PATCH] unpaged: private write VM_RESERVED The PageReserved removal in 2.6.15-rc1 issued a "deprecated" message when you tried to mmap or mprotect MAP_PRIVATE PROT_WRITE a VM_RESERVED, and failed with -EACCES: because do_wp_page lacks the refinement to COW pages in those areas, nor do we expect to find anonymous pages in them; and it seemed just bloat to add code for handling such a peculiar case. But immediately it caused vbetool and ddcprobe (using lrmi) to fail. So revert the "deprecated" messages, letting mmap and mprotect succeed. But leave do_wp_page's BUG_ON(vma->vm_flags & VM_RESERVED) in place until we've added the code to do it right: so this particular patch is only good if the app doesn't really need to write to that private area. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ed5297a94090d9a9f27b0ce1f9601ebe73561cff tree 00d28144ae949b3f9d566279cb12be0c802f86e6 parent aa1a64ee12ae130706f3fc0007841ce9b0ddf9c2 author Hugh Dickins Mon, 21 Nov 2005 21:32:11 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:41 -0800 [PATCH] unpaged: get_user_pages VM_RESERVED The PageReserved removal in 2.6.15-rc1 prohibited get_user_pages on the areas flagged VM_RESERVED in place of PageReserved. That is correct in theory - we ought not to interfere with struct pages in such a reserved area; but in practice it broke BTTV for one. So revert to prohibiting only on VM_IO: if someone gets into trouble with get_user_pages on VM_RESERVED, it'll just be a "don't do that". You can argue that videobuf_mmap_mapper shouldn't set VM_RESERVED in the first place, but now's not the time for breaking drivers without notice. Signed-off-by: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit aa1a64ee12ae130706f3fc0007841ce9b0ddf9c2 tree aa4dcbb8d1870209ae69dc85f241b8c1592ee4c1 parent 17d469715c6453e4994e6617e8f644bf10f38584 author Jeff Dike Mon, 21 Nov 2005 21:32:10 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:41 -0800 [PATCH] uml: eliminate use of libc PAGE_SIZE On some systems, libc PAGE_SIZE calls getpagesize, which can't happen from a stub. So, I use UM_KERN_PAGE_SIZE, which is less variable in its definition, instead. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 17d469715c6453e4994e6617e8f644bf10f38584 tree 0bfc17100309b888315c3cae02adfd1783c04774 parent e23181deec0d2a8be576faf9d71211abb84d5ccc author Jeff Dike Mon, 21 Nov 2005 21:32:09 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:41 -0800 [PATCH] uml: properly invoke x86_64 system calls This patch makes stub_segv use the stub_syscall macros. This was needed anyway, but the bug that prompted this was the discovery that gcc was storing stuff in RCX, which is trashed across a system call. This is exactly the sort of problem that the new macros fix. There is a stub_syscall0 for getpid. stub_segv was changed to be a libc file, and that caused some include changes. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e23181deec0d2a8be576faf9d71211abb84d5ccc tree 012a6ef362ae469e632d3490bf14b2b09ad4015e parent 39d730ab87f07592e3a3794353f097d5184cae7a author Jeff Dike Mon, 21 Nov 2005 21:32:08 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:41 -0800 [PATCH] uml: eliminate anonymous union and clean up symlink lossage This gives a name to the anonymous union introduced in skas-hold-own-ldt, allowing to build on a wider range of gccs. It also removes ldt.h, which somehow became real, and replaces it with a symlink, and creates ldt-x86_64.h as a copy of ldt-i386.h for now. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39d730ab87f07592e3a3794353f097d5184cae7a tree 36cb363e0815cb7508227a5063a677fe95e0fa4b parent 18317ab0ca5ac0c654be3eac31ebb781b4a5e9b2 author Jeff Dike Mon, 21 Nov 2005 21:32:04 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:41 -0800 [PATCH] uml: eliminate use of local in clone stub We have a bug in the i386 stub_syscall6 which pushes ebp before the system call and pops it afterwards. Because we use syscall6 to remap the stack, the old contents of the stack (and the former value of ebp) are no longer available. Some versions of gcc make from a real local, accessed through ebp, despite my efforts to make it obvious that references to from are really constants. This patch attempts to make it even more obvious by eliminating from and using a macro to access the stub's data explicitly with constants. My original thinking on this was to replace syscall6 with a remap_stack interface which saved ebp someplace and restored it afterwards. The problem is that there are no registers to put it in, except for esp. That could work, since we can store a constant in esp after the mmap because we just replaced the stack. However, this approach seems a tad cleaner. Signed-off-by: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18317ab0ca5ac0c654be3eac31ebb781b4a5e9b2 tree d92ae6722f6f18014f8c27b2d03080213f915ea3 parent 989e4d6cbc69191c41ddf4b1c492457410376b43 author Richard Knutsson Mon, 21 Nov 2005 21:32:03 -0800 committer Linus Torvalds Tue, 22 Nov 2005 09:13:41 -0800 [PATCH] net: Fix compiler-error on dgrs.c when !CONFIG_PCI drivers/net/dgrs.c: In function `dgrs_init_module': drivers/net/dgrs.c:1598: `dgrs_pci_driver' undeclared (first use in this function) Signed-off-by: Richard Knutsson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 989e4d6cbc69191c41ddf4b1c492457410376b43 tree 3c36672829527bef6951ca2f1eae7da4285fee31 parent 5ea8051a23de7b39bd5efebcaf63c05fd03f0d98 parent 963f48a116bf3b797fe184e74c79c50de1da70bb author Linus Torvalds Mon, 21 Nov 2005 19:04:44 -0800 committer Linus Torvalds Mon, 21 Nov 2005 19:04:44 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/scjody/ieee1394 commit 5ea8051a23de7b39bd5efebcaf63c05fd03f0d98 tree 1c74a3b42bf7eb067dad75da5c42d6bf535f42b0 parent 66b5920f61b020fc2fc34fef9c4fcdd86df3b52e parent c889b89619339636240227abb9ee5c9ec1167a1a author Linus Torvalds Mon, 21 Nov 2005 19:00:43 -0800 committer Linus Torvalds Mon, 21 Nov 2005 19:00:43 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-serial commit 66b5920f61b020fc2fc34fef9c4fcdd86df3b52e tree f516e0e9c9579aa30515b2ff23242871fe503a6f parent 49bd96c2caa3f02a9273d31b96e75b7574af8c06 parent 9b73fcf85f65a301107c89e05227cd6fd6965680 author Linus Torvalds Mon, 21 Nov 2005 19:00:05 -0800 committer Linus Torvalds Mon, 21 Nov 2005 19:00:05 -0800 Merge master.kernel.org:/home/rmk/linux-2.6-arm commit 49bd96c2caa3f02a9273d31b96e75b7574af8c06 tree 136e9ec7ebb8aed5559075894de1780ca73e3dc7 parent 8ad9ebb391e4cd75837ee608b9c33fcaceda0bc2 parent ab2ff46a2d22177daeae4d473c8916e4f14b4253 author Linus Torvalds Mon, 21 Nov 2005 17:44:56 -0800 committer Linus Torvalds Mon, 21 Nov 2005 17:44:56 -0800 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 commit ab2ff46a2d22177daeae4d473c8916e4f14b4253 tree 1a099ce6b7ee44a373f99b0c4cfc157b5b98412d parent 771388dc7d1efe26a40242bd509e87ade2c971d1 author Russ Anderson Fri, 11 Nov 2005 16:52:02 -0600 committer Tony Luck Mon, 21 Nov 2005 14:19:36 -0800 [IA64-SGI] bte_copy nasid_index fix The nasid_index was not being incremented if the pointer was null, causing an infinite loop. Signed-off-by: Russ Anderson (rja@sgi.com) Signed-off-by: Tony Luck commit 771388dc7d1efe26a40242bd509e87ade2c971d1 tree 210c724a31f993bc0f5f77f10b4c871b17285386 parent 090de0b77ceed1f1d05883fa744760f0c65d9c31 author Jack Steiner Fri, 18 Nov 2005 16:11:27 -0600 committer Tony Luck Mon, 21 Nov 2005 14:17:28 -0800 [IA64-SGI] support for older versions of PROM Add support for old versions of the SN PROMs. Eventually this support will be deleted but it is useful right now to continue supporting older PROMs. Signed-off-by: Jack Steiner Signed-off-by: Tony Luck commit 090de0b77ceed1f1d05883fa744760f0c65d9c31 tree 531288885c524904bf5baa4e7dadc4048fee3fd9 parent 9ad4f924ecd9c067a22a64699bcf4eaad1935a61 author hawkes@sgi.com Fri, 18 Nov 2005 11:30:34 -0800 committer Tony Luck Mon, 21 Nov 2005 14:15:42 -0800 [IA64] fix bug in sn/ia64 for sparse CPU numbering The kernel's use of the for_each_*cpu(i) macros has allowed for sparse CPU numbering. When I hacked the kernel to test sparse cpu_present_map[] and cpu_possible_map[] cpumasks, I discovered one remaining spot, in sn_hwperf_ioctl() during sn initialization, that needs to be fixed. Signed-off-by: John Hawkes Signed-off-by: Dean Roe Signed-off-by: Tony Luck commit 9ad4f924ecd9c067a22a64699bcf4eaad1935a61 tree d03ae4110659b46522fd7171f106b7cd4f72f722 parent 48b1dcc5d80921dc0c54f2fabf4fe6e8538cb9b3 author Prarit Bhargava Mon, 21 Nov 2005 13:00:38 -0500 committer Tony Luck Mon, 21 Nov 2005 14:13:31 -0800 [IA64] Prevent sn2 ptc code from executing on all ia64 subarches Patch to prevent sn2_ptc_init code from attempting to load on non-sn2 systems when sn2_smp.c is built-in to generic kernel. Signed-off-by: Prarit Bhargava Signed-off-by: Tony Luck commit 8ad9ebb391e4cd75837ee608b9c33fcaceda0bc2 tree bac5dc39477176652b07dea14052d6febc2708bc parent f9e6bfa141c5bcf3402d98204b7b23b310be9ddb author Jens Axboe Mon, 21 Nov 2005 19:49:41 +0100 committer Linus Torvalds Mon, 21 Nov 2005 11:04:52 -0800 [PATCH] as-iosched: remove state assertion in as_add_request() Kill the arq->state poison statement in as_add_request(), it can trigger for perfectly valid code that just reuses a request after io completion instead of freeing it and allocating a new one. We probably should introduce a blk_init_request() to start from scratch, but for now just kill it as we will be removing the as specific poisoning soon. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit f9e6bfa141c5bcf3402d98204b7b23b310be9ddb tree 8d1c9b6a232211893dd64306bb1f46313408111c parent 1a324727caa26cd65a359a958c90fbd251d4aa49 parent e7e37ee9c547213d726b29c2510cbb6696050405 author Linus Torvalds Mon, 21 Nov 2005 10:56:30 -0800 committer Linus Torvalds Mon, 21 Nov 2005 10:56:30 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart commit 1a324727caa26cd65a359a958c90fbd251d4aa49 tree 543a4f413c1c99f4b5be0b3c5f3744c9e4581db9 parent db93a82fa9d8b4d6e31c227922eaae829253bb88 parent 461ddf3b90bb149b99c3f675959c1bd6b11ed936 author Linus Torvalds Mon, 21 Nov 2005 10:46:34 -0800 committer Linus Torvalds Mon, 21 Nov 2005 10:46:34 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 commit c889b89619339636240227abb9ee5c9ec1167a1a tree b5c9dcda9140bdd2f67e233abd5174c5289b9dab parent db93a82fa9d8b4d6e31c227922eaae829253bb88 author Russell King Mon, 21 Nov 2005 17:05:21 +0000 committer Russell King Mon, 21 Nov 2005 17:05:21 +0000 [SERIAL] imx: Fix missed platform_driver_unregister Signed-off-by: Russell King commit 9b73fcf85f65a301107c89e05227cd6fd6965680 tree 89ad3fcbe4866e6b3ec6cc9a4c53933a1f54473e parent 2f3eca8b4f1e9ff3c712519170f5c070ddbddff9 author Russell King Mon, 21 Nov 2005 17:03:15 +0000 committer Russell King Mon, 21 Nov 2005 17:03:15 +0000 [ARM] Shut up gcc warning in clps7500 core.c core.c:263: warning: initialization makes integer from pointer without a cast Signed-off-by: Russell King commit 2f3eca8b4f1e9ff3c712519170f5c070ddbddff9 tree e4037cfe2a4476d2ab08b18ff91c46a2ab494e53 parent 30a09616df38ab282e66084f40fb438fe715b2ec author Russell King Mon, 21 Nov 2005 17:01:13 +0000 committer Russell King Mon, 21 Nov 2005 17:01:13 +0000 [ARM] Shut up gcc warning in assabet.c assabet.c:291: warning: 'scr' may be used uninitialized in this function Signed-off-by: Russell King commit 30a09616df38ab282e66084f40fb438fe715b2ec tree 83cf9893904ff066d45e6dca1cc0ad286f70bfb8 parent 5aaf291056b6142c11f6f7fd48cf937595a70e93 author Russell King Mon, 21 Nov 2005 15:26:52 +0000 committer Russell King Mon, 21 Nov 2005 15:26:52 +0000 [ARM] ebsa110: __arch_ioremap should be 3 args Signed-off-by: Russell King commit 5aaf291056b6142c11f6f7fd48cf937595a70e93 tree 5a08149880480ddbe43929e99adf152fc94b11c1 parent 19f07be3b83d707940cc29abd8cc99d36d9d1f4e author Russell King Mon, 21 Nov 2005 15:26:18 +0000 committer Russell King Mon, 21 Nov 2005 15:26:18 +0000 [ARM] Add asm/memory.h to asm/numnodes.h Since the defintion of NODES_SHIFT may be overridden in asm/arch/memory.h it's important to include asm/memory.h into asm/numnodes.h to ensure that the correct value is always defined. Signed-off-by: Russell King commit 19f07be3b83d707940cc29abd8cc99d36d9d1f4e tree ee05d217be5811f9e8a935849055e222fa9b84aa parent 067c90481aad752dca9a4685091c0163dec7dfe0 author Kenneth Tan Mon, 21 Nov 2005 15:17:07 +0000 committer Russell King Mon, 21 Nov 2005 15:17:07 +0000 [ARM] 3171/1: To add missing QMGR region size for IXP4XX Patch from Kenneth Tan To add queue manager region size which is missing from ixp4xx-regs.h Signed-off-by: Kenneth Tan Signed-off-by: Russell King commit 067c90481aad752dca9a4685091c0163dec7dfe0 tree 3234252b7fa5906858ba54beb7eb9a7e503487c6 parent db93a82fa9d8b4d6e31c227922eaae829253bb88 author Dirk Opfer Mon, 21 Nov 2005 15:17:06 +0000 committer Russell King Mon, 21 Nov 2005 15:17:06 +0000 [ARM] 3170/1: Sharp SL-6000x: platform device conversion fixup Patch from Dirk Opfer Fix an error in tosa.c after the platform device conversion. Signed-off-by: Dirk Opfer Signed-off-by: Russell King commit e7e37ee9c547213d726b29c2510cbb6696050405 tree 50c45625de666b23f209d79eb1bfae05c64feee9 parent c243f1f1f6545985afcc6adf1fc085729029c3ee parent db93a82fa9d8b4d6e31c227922eaae829253bb88 author Dave Jones Mon, 21 Nov 2005 06:56:52 -0800 committer Dave Jones Mon, 21 Nov 2005 06:56:52 -0800 Merge ../linus/ commit c243f1f1f6545985afcc6adf1fc085729029c3ee tree 6cc10f5552f8ee46118f983f2b29fbfa1b84870b parent a42ab7f2349a72ecf5c3b1b7c836dc4249a71c0c author Dave Jones Mon, 21 Nov 2005 06:53:16 -0800 committer Dave Jones Mon, 21 Nov 2005 06:53:16 -0800 [AGPGART] Support VIA P4M800CE bridge. Signed-off-by: Dave Jones commit 461ddf3b90bb149b99c3f675959c1bd6b11ed936 tree 12c7848560128e4344387eecdfc401369d46bb1c parent b84f4cc977ec4a1260dc8d9165efc9319a93c2a2 author Randy Dunlap Sun, 20 Nov 2005 21:25:15 -0800 committer David S. Miller Sun, 20 Nov 2005 21:25:15 -0800 [NET]: kernel-doc fixes Fix kernel-doc warnings in network files. Signed-off-by: Randy Dunlap Signed-off-by: David S. Miller commit b84f4cc977ec4a1260dc8d9165efc9319a93c2a2 tree 03e60bfcc51dfcb288fb2efe62e9ec805704c3d0 parent a516b04950f62d36b33db00c0d3c69d09dae99a9 author Patrick McHardy Sun, 20 Nov 2005 21:19:21 -0800 committer David S. Miller Sun, 20 Nov 2005 21:19:21 -0800 [NET]: Use unused bit for ipvs_property field in struct sk_buff Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit a516b04950f62d36b33db00c0d3c69d09dae99a9 tree e5b51543ab34f4cbec9ead2fa68590afba3e71f2 parent bd4cfb594bdea00c3920b31bd12f497fc4a2e79c author Patrick McHardy Sun, 20 Nov 2005 21:16:13 -0800 committer David S. Miller Sun, 20 Nov 2005 21:16:13 -0800 [DCCP]: Add missing no_policy flag to struct net_protocol Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit bd4cfb594bdea00c3920b31bd12f497fc4a2e79c tree 30d0ab6a23675dc3ab19e6b2e760c93ea3fe2d6d parent 2b8f2ff6f4c11fff9c3016b54fa261f522a54b70 author Nicolas Kaiser Sun, 20 Nov 2005 21:11:31 -0800 committer David S. Miller Sun, 20 Nov 2005 21:11:31 -0800 [NETFILTER]: Remove ARRAY_SIZE duplicate Signed-off-by: Nicolas Kaiser Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit 2b8f2ff6f4c11fff9c3016b54fa261f522a54b70 tree 0bc88eba499802034b23580088b520c133ce7fcf parent c9e53cbe7ad6eabb3c7c5140b6127b4e5f9ee840 author Yasuyuki Kozakai Sun, 20 Nov 2005 21:09:55 -0800 committer David S. Miller Sun, 20 Nov 2005 21:09:55 -0800 [NETFILTER]: fixed dependencies between modules related with ip_conntrack - IP_NF_CONNTRACK_MARK is bool and depends on only IP_NF_CONNTRACK which is tristate. If a variable depends on IP_NF_CONNTRACK_MARK and doesn't care about IP_NF_CONNTRACK, it can be y. This must be avoided. - IP_NF_CT_ACCT has same problem. - IP_NF_TARGET_CLUSTERIP also depends on IP_NF_MANGLE. Signed-off-by: Yasuyuki Kozakai Signed-off-by: Harald Welte Signed-off-by: David S. Miller commit c9e53cbe7ad6eabb3c7c5140b6127b4e5f9ee840 tree a74df1b3b0defeba225fd260934c3444a171db42 parent 1ef43204f4bd24dcd3156185b19b31b6b4151ae9 author Patrick McHardy Sun, 20 Nov 2005 21:09:00 -0800 committer David S. Miller Sun, 20 Nov 2005 21:09:00 -0800 [FIB_TRIE]: Don't show local table in /proc/net/route output Don't show local table to behave similar to fib_hash. Signed-off-by: Patrick McHardy Signed-off-by: David S. Miller commit 1ef43204f4bd24dcd3156185b19b31b6b4151ae9 tree 812293eda94f9e14ee35c0be3d84da4b96f4972e parent 5d5780df23537ad0db72267fe11103d2c23d9b2a parent df9890c31a1a447254f39e40c3fd81ad6547945b author David S. Miller Sun, 20 Nov 2005 20:52:16 -0800 committer David S. Miller Sun, 20 Nov 2005 20:52:16 -0800 Merge git://git.skbuff.net/gitroot/yoshfuji/linux-2.6.14+advapi-fix/ commit db93a82fa9d8b4d6e31c227922eaae829253bb88 tree bf816f7c7055127415fc3b718e260855df815d55 parent 9e18fcdd346c6befdac360c047327fb058f33628 author Dmitry Torokhov Sun, 20 Nov 2005 11:13:29 -0500 committer Linus Torvalds Sun, 20 Nov 2005 14:06:28 -0800 [PATCH] Fix an OOPS is CinergyT2 Fix an OOPS is CinergyT2 driver when registering IR remote Signed-off-by: Dmitry Torokhov Signed-off-by: Linus Torvalds commit 5d5780df23537ad0db72267fe11103d2c23d9b2a tree 3a442b265c3494072d4cdf15c8d3a38ada33a734 parent 4909724b5dee8fb7c52bbe90afa40c65b17be9eb author Yan Zheng Sun, 20 Nov 2005 13:42:20 -0800 committer David S. Miller Sun, 20 Nov 2005 13:42:20 -0800 [IPV6]: Acquire addrconf_hash_lock for read in addrconf_verify(...) addrconf_verify(...) only traverse address hash table when addrconf_hash_lock is held for writing, and it may hold addrconf_hash_lock for a long time. So I think it's better to acquire addrconf_hash_lock for reading instead of writing Signed-off-by: Yan Zheng Signed-off-by: David S. Miller commit 4909724b5dee8fb7c52bbe90afa40c65b17be9eb tree 7611a0f01ff0b0a1389928683b4223c160123d2a parent fb0d366b0803571f06a5b838f02c6706fc287995 author Alexandra Kossovsky Sun, 20 Nov 2005 13:41:59 -0800 committer David S. Miller Sun, 20 Nov 2005 13:41:59 -0800 [COMPAT] net: SIOCGIFCONF data corruption From: Alexandra Kossovsky From http://bugzilla.kernel.org/show_bug.cgi?id=4746 There is user data corruption when using ioctl(SIOCGIFCONF) in 32-bit application running amd64 kernel. I do not think that this problem is exploitable, but any data corruption may lead to security problems. Following code demonstrates the problem #include #include #include #include #include #include char buf[256]; main() { int s = socket(AF_INET, SOCK_DGRAM, 0); struct ifconf req; int i; req.ifc_buf = buf; req.ifc_len = 41; printf("Result %d\n", ioctl(s, SIOCGIFCONF, &req)); printf("Len %d\n", req.ifc_len); for (i = 41; i < 256; i++) if (buf[i] != 0) printf("Byte %d is corrupted\n", i); } Steps to reproduce: Compile the code above into 32-bit elf and run it. You'll get Result 0 Len 32 Byte 48 is corrupted Byte 52 is corrupted Byte 53 is corrupted Byte 54 is corrupted Byte 55 is corrupted Signed-off-by: Andrew Morton Signed-off-by: David S. Miller commit fb0d366b0803571f06a5b838f02c6706fc287995 tree 473d0e16f244ef7c7415d865419b7b0187f52a7f parent aa8751667dcd757dd9a711b51140adf181501c44 author Kris Katterjohn Sun, 20 Nov 2005 13:41:34 -0800 committer David S. Miller Sun, 20 Nov 2005 13:41:34 -0800 [NET]: Reject socket filter if division by constant zero is attempted. This way we don't have to check it in sk_run_filter(). Signed-off-by: Kris Katterjohn Signed-off-by: David S. Miller commit aa8751667dcd757dd9a711b51140adf181501c44 tree 6f5e96806b59d6a1601168eab5e0843a00380253 parent 252ec9e28f0cf350e246c065ffe70a2e32b84ad4 author Andrea Bittau Sun, 20 Nov 2005 13:41:05 -0800 committer David S. Miller Sun, 20 Nov 2005 13:41:05 -0800 [PKT_SCHED]: sch_netem: correctly order packets to be sent simultaneously If two packets were queued to be sent at the same time in the future, their order would be reversed. This would occur because the queue is traversed back to front, and a position is found by checking whether the new packet needs to be sent before the packet being examined. If the new packet is to be sent at the same time of a previous packet, it would end up before the old packet in the queue. This patch places packets in the correct order when they are queued to be sent at a same time in the future. Signed-off-by: Andrea Bittau Signed-off-by: David S. Miller commit 9e18fcdd346c6befdac360c047327fb058f33628 tree 12d9413d14ebb8febe14096bf75c37ed7fc0bf3c parent e6c667592e824c2871fe0ae3bc4b9bc7e81941f4 author Andi Kleen Sun, 20 Nov 2005 18:49:08 +0100 committer Linus Torvalds Sun, 20 Nov 2005 11:52:59 -0800 [PATCH] Remove compat ioctl semaphore Originally for 2.6.16, but the semaphore causes problems for some people so get rid of it now. It's not needed anymore because the ioctl hash table is never changed at run time now. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e6c667592e824c2871fe0ae3bc4b9bc7e81941f4 tree e62fee402509ad4f446a06dec0564462a5e04fae parent fbe83e209ad9c8281e29ac17a60f91119d86fa8c author Jacob.Shin@amd.com Sun, 20 Nov 2005 18:49:07 +0100 committer Linus Torvalds Sun, 20 Nov 2005 11:52:59 -0800 [PATCH] Fix x86_64/msr.h interface to agree with i386/msr.h Ever since we remove msr.c from x86_64 branch and started grabbing it from i386, msr device (read functionality) has been broken for us. This is due to the differences between asm-i386/msr.h and asm-x86_64/msr.h interfaces. Here is a patch to our side to fix this. Thankfully, as of current (2.6.15-rc1-git6) tree, arch/i386/kernel/msr.c is the only file that uses rdmsr_safe macro. Signed-off-by: Jacob Shin Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit fbe83e209ad9c8281e29ac17a60f91119d86fa8c tree 8b4feb2f647f9cbf602c3d25da02787c934321f2 parent d7169160bb772efe6510d8bc0c8e7625efbcc0b3 author Ashok Raj Sun, 20 Nov 2005 18:49:06 +0100 committer Linus Torvalds Sun, 20 Nov 2005 11:52:59 -0800 [PATCH] Register disabled CPUs Needed to make the earlier use disabled CPUs for CPU hotplug patch actually work. Need to register disabled processors as well, so we can count them towards cpu_possible_map as hot pluggable cpus. Signed-off-by: Ashok Raj Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit d7169160bb772efe6510d8bc0c8e7625efbcc0b3 tree 3c460047530fa53a8fc3bea4f124eb86febf2d07 parent 252ec9e28f0cf350e246c065ffe70a2e32b84ad4 author Andi Kleen Sun, 20 Nov 2005 18:49:05 +0100 committer Linus Torvalds Sun, 20 Nov 2005 11:52:59 -0800 [PATCH] i386: Use bigsmp for > 8 core Opteron systems bigsmp is reported to work on large Opteron systems on 32bit too. Enable it by default there. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit 252ec9e28f0cf350e246c065ffe70a2e32b84ad4 tree d282a3293c9547da95c4e145175bd86741f5d5f4 parent d4892279d786dd11f9d6269b3029ad3340e79597 parent 1e6b39fbb61800e3ecee58dc8c4bca57c89365cd author Linus Torvalds Sun, 20 Nov 2005 09:19:38 -0800 committer Linus Torvalds Sun, 20 Nov 2005 09:19:38 -0800 Merge master.kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6 commit d4892279d786dd11f9d6269b3029ad3340e79597 tree 865fc2a2da5db31fa931fa741dec491fc02e21c7 parent d271d1c2217b2e9868c32c0437d76b2af3a4b971 author Dmitry Torokhov Sun, 20 Nov 2005 00:57:02 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:57:02 -0500 Fix missing initialization in ir-kbd-gpio.c Signed-off-by: Dmitry Torokhov commit d271d1c2217b2e9868c32c0437d76b2af3a4b971 tree b5f691d8196d9c12f219126c30248496babe30df parent 9e50afd0cb3ff9ee152dbcf8601f5fb7eba5cff8 author Dmitry Torokhov Sun, 20 Nov 2005 00:56:54 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:56:54 -0500 Fix an OOPS when initializing IR remote on saa7134 Signed-off-by: Dmitry Torokhov commit 9e50afd0cb3ff9ee152dbcf8601f5fb7eba5cff8 tree f3b2a72384a1b59ea38b201bbf2f35c306941b4b parent bd0ef2356cd85d39387be36fdf1f83a40075057f author Dmitry Torokhov Sun, 20 Nov 2005 00:56:43 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:56:43 -0500 Input: make serio and gameport more swsusp friendly kseriod and kgameportd used to process all pending events before checking for freeze condition. This may cause swsusp to time out while stopping tasks when resuming. Switch to process events one by one to check freeze status more often. Signed-off-by: Dmitry Torokhov commit bd0ef2356cd85d39387be36fdf1f83a40075057f tree 590c7a005823ecc6836ee17a47fd9b43fcb6e85a parent e597f0c80de7e2ef840b28d111ec532988abc432 author Dmitry Torokhov Sun, 20 Nov 2005 00:56:31 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:56:31 -0500 Input: handle failures in input_register_device() Signed-off-by: Dmitry Torokhov commit e597f0c80de7e2ef840b28d111ec532988abc432 tree 2d8c36d705c27dd081cbd7a6907257d3ad43c8e0 parent 59c7c0377e00a3cbd7b71631177fb92166ceb437 author Dmitry Torokhov Sun, 20 Nov 2005 00:51:43 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:51:43 -0500 Input: uinput - don't use "interruptible" in FF code If thread that submitted FF request gets interrupted somehow it will release request structure and ioctl handler will work with freed memory. TO prevent that from happening switch to using wait_for_completion instead of wait_for_completion_interruptible. Signed-off-by: Dmitry Torokhov commit 59c7c0377e00a3cbd7b71631177fb92166ceb437 tree 74457d6759338db05c29eb5dc766b8472b7bb496 parent 29506415a0ff0152cc2928f8fcac724fbbf98651 author Dmitry Torokhov Sun, 20 Nov 2005 00:51:33 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:51:33 -0500 Input: uinput - add UI_SET_SWBIT ioctl Signed-off-by: Dmitry Torokhov commit 29506415a0ff0152cc2928f8fcac724fbbf98651 tree e1da48667c6b0499f2ea882b1d762758241da1e6 parent e753b650e10af8a040b1081e72088b826bdef72f author Dmitry Torokhov Sun, 20 Nov 2005 00:51:22 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:51:22 -0500 Input: uinput - convert to dynalloc allocation Also introduce proper locking when creating/deleting device. Signed-off-by: Dmitry Torokhov commit e753b650e10af8a040b1081e72088b826bdef72f tree d9f8c5dfb1e7ecdc9404f15a94b237053e1b1cbc parent a5b0cc80bc3cc98809c7674bda9928db497f0ebb author Miloslav Trmac Sun, 20 Nov 2005 00:51:05 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:51:05 -0500 Input: wistron - disable wifi/bluetooth on suspend Try to save battery power by disabling wifi and bluetooth on suspend. Signed-off-by: Miloslav Trmac Signed-off-by: Dmitry Torokhov commit a5b0cc80bc3cc98809c7674bda9928db497f0ebb tree 1f0b203663ca1ad3f4e7534870880f7d6d675a12 parent 22a397e2c189dedf857836f2a49542b8aedfeb65 author Dmitry Torokhov Sun, 20 Nov 2005 00:50:58 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:50:58 -0500 Input: wistron - add PM support Register wistron-bios as a platform device, restore WIFI and Bluetooth state upon resume. Signed-off-by: Dmitry Torokhov commit 22a397e2c189dedf857836f2a49542b8aedfeb65 tree 308297aafad1841a44106cd29d7975ee5d07d197 parent 84b256a66360cedc25eb6e2ac6f167ca9778307b author Dmitry Torokhov Sun, 20 Nov 2005 00:50:46 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:50:46 -0500 Input: wistron - convert to dynamic input_dev allocation Signed-off-by: Dmitry Torokhov commit 84b256a66360cedc25eb6e2ac6f167ca9778307b tree 55fe8c50722332fb59e0a7a499146c1f4a49e12a parent e9fb028ea2a0a70dad0f467410418e5ee2af811b author Bernhard Rosenkraenzer Sun, 20 Nov 2005 00:50:37 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:50:37 -0500 Input: wistron - add support for Acer Aspire 1500 notebooks Also fix a potential issue with some notebooks: The current code assumes the response to bios_wifi_get_default_setting is either 1 (disabled) or 3 (enabled), or wifi isn't supported. The BIOS response appears to be a bit field w/ 0x1 indicating hardware presence, 0x2 indicating actiation status, and the other 6 bits being unknown/reserved -- with the patch, these 6 bits are ignored. Signed-off-by: Bernhard Rosenkraenzer Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit e9fb028ea2a0a70dad0f467410418e5ee2af811b tree 34b4a5a6750ab398d160d1bcff72c850ab26f4e3 parent 5fc1468029e2a4da90ded1e0e2cdd94fbdf83bac author Andrew Morton Sun, 20 Nov 2005 00:50:21 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:50:21 -0500 Input: wistron - disable for x86_64 On x86_64: {standard input}:233: Error: suffix or operands invalid for `push' {standard input}:233: Error: suffix or operands invalid for `pop' Signed-off-by: Andrew Morton Signed-off-by: Dmitry Torokhov commit 5fc1468029e2a4da90ded1e0e2cdd94fbdf83bac tree 38cbda2acfd20e4f71da4ef62374797e2f55aed5 parent 0d4c859734a818721b2d5ac712283ba8f92bd23a author Dmitry Torokhov Sun, 20 Nov 2005 00:50:06 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:50:06 -0500 Input: add Wistron driver A driver for laptop buttons using an x86 BIOS interface that is apparently used on quite a few laptops and seems to be originating from Wistron. This driver currently "knows" only about Fujitsu-Siemens Amilo Pro V2000 (i.e. it can detect the laptop using DMI and it contains the keycode->key meaning mapping for this laptop) and Xeron SonicPro X 155G (probably can't be reliably autodetected, requires a module parameter), adding other laptops should be easy. In addition to reporting button presses to the input layer the driver also allows enabling/disabling the embedded wireless NIC (using the "Wifi" button); this is done using the same BIOS interface, so it seems only logical to keep the implementation together. Any flexibility possibly gained by allowing users to remap the function of the "Wifi" button is IMHO not worth it when weighted against the necessity to run an user-space daemon to convert button presses to wifi state changes. Signed-off-by: Miloslav Trmac Signed-off-by: Dmitry Torokhov commit 0d4c859734a818721b2d5ac712283ba8f92bd23a tree d9735f6da17572f45ebe47f8f200ac7161129f79 parent 3bedff1d73b86e0cf52634efb447e9ada08f2cc6 author Dmitry Torokhov Sun, 20 Nov 2005 00:49:42 -0500 committer Dmitry Torokhov Sun, 20 Nov 2005 00:49:42 -0500 Input: atkbd - speed up setting leds/repeat state Changing led state is pretty slow operation; when there are multiple requests coming at a high rate they may interfere with normal typing. Try optimize (skip) changing hardware state when multiple requests are coming back-to-back. Signed-off-by: Dmitry Torokhov commit 1e6b39fbb61800e3ecee58dc8c4bca57c89365cd tree 513ce034cff05371496713b8327f9dc074bdcc6d parent cdbce9c87e4ebd186389919b95e49592ec35dae6 parent 3bedff1d73b86e0cf52634efb447e9ada08f2cc6 author Steve French Sat, 19 Nov 2005 21:05:42 -0800 committer Steve French Sat, 19 Nov 2005 21:05:42 -0800 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit cdbce9c87e4ebd186389919b95e49592ec35dae6 tree 974cebc4454156f18dd1e1e3d2679bee6e172703 parent 86c96b4bb70dac67d6815e09a0949427d439b280 author Steve French Sat, 19 Nov 2005 21:04:52 -0800 committer Steve French Sat, 19 Nov 2005 21:04:52 -0800 [CIFS] Fix setattr of mode only (e.g. in some chmod cases) to Windows so it does not return EACCESS (unless server really returns that). Signed-off-by: Steve French commit df9890c31a1a447254f39e40c3fd81ad6547945b tree bf432d75796112d86d102fe721bdce93e6ad6901 parent a305989386e402f48b216786a5c8cf440b33bdad author YOSHIFUJI Hideaki Sun, 20 Nov 2005 12:23:18 +0900 committer YOSHIFUJI Hideaki Sun, 20 Nov 2005 12:23:18 +0900 [IPV6]: Fix sending extension headers before and including routing header. Based on suggestion from Masahide Nakamura . Signed-off-by: YOSHIFUJI Hideaki commit a305989386e402f48b216786a5c8cf440b33bdad tree a61fb5850f3ee439a1848988cb81923939dc71e7 parent 8b8aa4b5a66ecf90f0a7033c8cbc49cfd97c4347 author Ville Nuorvala Sun, 20 Nov 2005 12:21:59 +0900 committer YOSHIFUJI Hideaki Sun, 20 Nov 2005 12:21:59 +0900 [IPV6]: Fix calculation of AH length during filling ancillary data. Signed-off-by: YOSHIFUJI Hideaki commit 8b8aa4b5a66ecf90f0a7033c8cbc49cfd97c4347 tree dded29563ca2fc586c29d24ff400a1eb63bc370e parent 741b2252a5e14d6c60a913c77a6099abe73a854a author YOSHIFUJI Hideaki Sun, 20 Nov 2005 12:18:17 +0900 committer YOSHIFUJI Hideaki Sun, 20 Nov 2005 12:18:17 +0900 [IPV6]: Fix memory management error during setting up new advapi sockopts. Signed-off-by: YOSHIFUJI Hideaki commit 86c96b4bb70dac67d6815e09a0949427d439b280 tree f36ac16583ea9f935fcbed006a8edd99cf83852f parent c119b87d596cdd99ac20095ae2ae90b525418605 author Steve French Fri, 18 Nov 2005 20:25:31 -0800 committer Steve French Fri, 18 Nov 2005 20:25:31 -0800 [CIFS] Fix mknod of block and chardev over SFU mounts Signed-off-by: Steve French commit 963f48a116bf3b797fe184e74c79c50de1da70bb tree 431f51f665da31a68536cfa937ace69e0ff92334 parent e67b23c71cb9ee02d65a74c3858716ba2dedd554 author Jody McIntyre Mon, 07 Nov 2005 06:29:39 -0500 committer Jody McIntyre Fri, 18 Nov 2005 16:41:39 -0500 sbp2_command_orb_lock must be held when accessing the _orb_inuse list. Fixes an oops in sbp2util_find_command_for_SCpnt after sbp2scsi_abort: https://bugzilla.novell.com/show_bug.cgi?id=113734 Signed-off-by: Jody McIntyre Signed-off-by: Stefan Richter (cherry picked from 7945619794314414a5c44df11fca4d3f2a3389cf commit) commit 48b1dcc5d80921dc0c54f2fabf4fe6e8538cb9b3 tree c3c20121ec0bc79ef8059f34a9a9cc9109db8e95 parent e67b23c71cb9ee02d65a74c3858716ba2dedd554 author Mark Maule Thu, 17 Nov 2005 15:50:01 -0600 committer Tony Luck Fri, 18 Nov 2005 13:06:03 -0800 [IA64] altix: fix copyright in tioce .h files Fix up copyright in tioce header files Signed-off-by: Mark Maule Signed-off-by: Tony Luck commit c119b87d596cdd99ac20095ae2ae90b525418605 tree 3a5967800f0c0fd0a3cee88217d90144c3a3b12f parent 3020a1f58c564e3060ec908c0c4f1b74a12e4280 author Steve French Fri, 18 Nov 2005 12:27:27 -0800 committer Steve French Fri, 18 Nov 2005 12:27:27 -0800 [CIFS] Missing part of previous patch Signed-off-by: Steve French commit 3020a1f58c564e3060ec908c0c4f1b74a12e4280 tree bc278fcd367cfc23d7670986943403735b7e9a18 parent 87c89dd7330735d70cc9912483f6f4c7bc3ff19c author Steve French Fri, 18 Nov 2005 11:31:10 -0800 committer Steve French Fri, 18 Nov 2005 11:31:10 -0800 [CIFS] Fix scheduling while atomic when pending writes at file close time Fix the case in which readdir reset file type when SFU mount option specified. Also fix sfu related functions to not request EAs (xattrs) when not configured in Kconfig Signed-off-by: Steve French commit 87c89dd7330735d70cc9912483f6f4c7bc3ff19c tree 4c41a67499a0f2c06cc4da3a8fd419f7548c63b6 parent 9e294f1c4d4a5fc0068fcb21f5809ff6e88e49bc author Steve French Thu, 17 Nov 2005 17:03:00 -0800 committer Steve French Thu, 17 Nov 2005 17:03:00 -0800 [CIFS] Vectored and async i/o turned on and correct the writev and aio_write to flush properly. This is Christoph's patch merged with the new nobrl file operations Signed-off-by: Dave Kleikamp From: Christoph Hellwig - support vectored and async aio ops unconditionally - this is above the pagecache and transparent to the fs - remove cifs_read_wrapper. it was only doing silly checks and calling generic_file_write in all cases. - use do_sync_read/do_sync_write as read/write operations. They call ->readv/->writev which we now always implemente. - add the filemap_fdatawrite calls to writev/aio_write which were missing previously compared to plain write. no idea what the point behind them is, but let's be consistent at least.. Signed-off-by: Christoph Hellwig Signed-off-by: Steven French Signed-off-by: Andrew Morton commit 9e294f1c4d4a5fc0068fcb21f5809ff6e88e49bc tree 955f905c13f9d8d21c3e0c90f37849ff6170febd parent 0f2b27c438cb593717dde8ee0fc05e0874eabbb6 author Steve French Thu, 17 Nov 2005 16:59:21 -0800 committer Steve French Thu, 17 Nov 2005 16:59:21 -0800 [CIFS] Recognize properly symlinks and char/blk devices (not just FIFOs) created by SFU (part 2 of 2). Thanks to Martin Koeppe for useful analysis. Signed-off-by: Steve French commit a42ab7f2349a72ecf5c3b1b7c836dc4249a71c0c tree 2c2cd2e32a1356162a8f3b1fdc06d505333454d7 parent 5e9ad06ad953c6022e4a7f6012c9b5708a8a5d8a author Dave Jones Wed, 16 Nov 2005 16:07:02 -0800 committer Dave Jones Wed, 16 Nov 2005 16:07:02 -0800 [AGPGART] Mark AMD64 aperture size structs as const Neither of them are ever written to. Noted by Arjan van de Ven Signed-off-by: Dave Jones commit 5e9ad06ad953c6022e4a7f6012c9b5708a8a5d8a tree 098c1fcbf0ba944afd2da299a9307bb763c41932 parent 0db169f9703115bab09eda5d89a8f6937a7bf98e author Dave Jones Wed, 16 Nov 2005 16:05:49 -0800 committer Dave Jones Wed, 16 Nov 2005 16:05:49 -0800 [AGPGART] Mark maxes_table as const It's never written to. Noted by Arjan van de Ven Signed-off-by: Dave Jones commit 0f2b27c438cb593717dde8ee0fc05e0874eabbb6 tree 53946a1f701e8c008f9eea8a490be2f81c47b419 parent c12489ad40a9db6b17225e0f38151d41c6175fe8 author Steve French Wed, 16 Nov 2005 14:25:50 -0800 committer Steve French Wed, 16 Nov 2005 14:25:50 -0800 [CIFS] Fix sparse warnings on smb bcc (byte count) Signed-off-by: Dave Kleikamp Signed-off-by: Steve French commit c12489ad40a9db6b17225e0f38151d41c6175fe8 tree cf7ea08c0b3bf106975047c66b8bb0b560cc4e3e parent ff7feac9638e162263463edaeb342b4f3b1ce90e parent 1e185b97b4364063f1135604b87f8d8469944233 author Steve French Tue, 15 Nov 2005 16:49:04 -0800 committer Steve French Tue, 15 Nov 2005 16:49:04 -0800 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit ff7feac9638e162263463edaeb342b4f3b1ce90e tree 9648611f4ff41bb3e16b1ace87e4bf3802075d99 parent d6e2f2a4c892e4d131ab4fa5d212546c47dd3c40 author Steve French Tue, 15 Nov 2005 16:45:16 -0800 committer Steve French Tue, 15 Nov 2005 16:45:16 -0800 [CIFS] Fix endian errors (setfacl/getfacl failures) in handling ACLs (and a ppc64 compiler warning) Signed-off-by: Dave Kleikamp Signed-off-by: Steve French commit d6e2f2a4c892e4d131ab4fa5d212546c47dd3c40 tree ce457134489d125f496247997f60fe1c5d2d3077 parent 7b0a65f9923ffe7885a5473648baaa3a1a701726 author Steve French Tue, 15 Nov 2005 16:43:39 -0800 committer Steve French Tue, 15 Nov 2005 16:43:39 -0800 [CIFS] Recognize properly symlinks and char/blk devices (not just FIFOs) created by SFU (part 1 of 2). Signed-off-by: Steve French commit 7b0a65f9923ffe7885a5473648baaa3a1a701726 tree b9be4a0504b4e637b86bdc92d88268ff57ea1bc5 parent 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 parent ee90f62b3e69d0cd9f8edc6b95f07b1a8c38aaf4 author Steve French Sun, 13 Nov 2005 20:28:58 -0800 committer Steve French Sun, 13 Nov 2005 20:28:58 -0800 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit 1b98a8221e3c9c86ae7e292ba7542d2dd6f10eb9 tree 2e0051ccb147b0553d50c14681c50881098859d6 parent e89dc9209692293434da45ec31826a55becb91c0 parent 9e6c67fd2716720d9029d38ea25884efcfdedeb6 author Steve French Sat, 12 Nov 2005 19:53:33 -0800 committer Steve French Sat, 12 Nov 2005 19:53:33 -0800 Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git commit e89dc9209692293434da45ec31826a55becb91c0 tree 171ebb84c30467cbff8a5bf8213dbf40e64d84f7 parent 8b94bcb923dff923a5a5b7c6f890702a54cb19cf author Steve French Fri, 11 Nov 2005 15:18:19 -0800 committer Steve French Fri, 11 Nov 2005 15:18:19 -0800 [CIFS] Cleanup sparse warnings for unicode little endian casts Following Shaggy's suggestion, do a better job on the unicode string handling routines in cifs in specifying that the wchar_t are really little endian widechars (__le16). Signed-off-by: Steve French commit 8b94bcb923dff923a5a5b7c6f890702a54cb19cf tree 2ea55c01e0c5dfead8699484b0bae2a375b1f61c parent 1b397f4f1c167dbf06397b3182fca521c00125c4 author Steve French Fri, 11 Nov 2005 11:41:00 -0800 committer Steve French Fri, 11 Nov 2005 11:41:00 -0800 [CIFS] Fix CIFS "nobrl" mount option so does not disable sending brl requests for all mounts just that particular mount. Found by Arjan Vand de Ven Signed-off-by: Steve French