commit ba460e48064edeb57e3398eb8972c58de33f11ea tree 1eefb36f0e5e63123a910abcb7b238c429c8ed0f parent 98848fa83bb6a4572ad55daeb312182dec9bed58 author Matthias Urlichs Thu, 14 Jul 2005 00:33:47 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:26 -0700 [PATCH] Option Card driver update, Maintainer entry This patch updates the Option Card driver: - remove a deadlock - add sponsor notice - add new card - renamed the device to what's usually printed on it - removed some dead code - clean up a bunch of irregular whitespace (end-of-line, tabs) Also add a MAINTAINERS entry for the Option Card driver. Signed-Off-By: Matthias Urlichs Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 98848fa83bb6a4572ad55daeb312182dec9bed58 tree 9221e935f4cd3bfb6da2422806aee41f2040ed2e parent a2d2b5cb8e5d8787f009eeb3bbca52687bd42a77 author Olaf Hering Thu, 14 Jul 2005 00:33:45 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:26 -0700 [PATCH] ratelimit the ieee1394 IR legacy activated messages running coriander1 with an Apple iSight produces lots of dmesg output. Jul 13 22:14:17 ibook kernel: ieee1394: raw1394: /dev/raw1394 device initialized Jul 13 22:15:28 ibook kernel: ohci1394: fw-host0: IR legacy activated Jul 13 22:15:59 ibook last message repeated 208 times Jul 13 22:17:00 ibook last message repeated 762 times Jul 13 22:18:01 ibook last message repeated 914 times Jul 13 22:18:17 ibook last message repeated 238 times Jul 13 22:18:17 ibook kernel: ieee1394: unsolicited response packet received - no tlabel match Jul 13 22:18:17 ibook kernel: ohci1394: fw-host0: IR legacy activated its less noisy with the patch: Jul 14 08:03:08 ibook kernel: ieee1394: raw1394: /dev/raw1394 device initialized Jul 14 08:03:26 ibook kernel: ohci1394: fw-host0: IR legacy activated Jul 14 08:03:42 ibook last message repeated 10 times Jul 14 08:03:47 ibook kernel: printk: 63 messages suppressed. Jul 14 08:03:47 ibook kernel: ohci1394: fw-host0: IR legacy activated Jul 14 08:03:52 ibook kernel: printk: 74 messages suppressed. Signed-off-by: Olaf Hering Cc: Jody McIntyre Cc: Ben Collins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2d2b5cb8e5d8787f009eeb3bbca52687bd42a77 tree 68590f6b94eaec2f30297503bcc71e2dee0bc790 parent a0d43df931870997467042931e8fb7657375d327 author Paolo 'Blaisorblade' Giarrusso Thu, 14 Jul 2005 00:33:44 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:25 -0700 [PATCH] remove EXPORT_SYMBOL for root_dev Remove ROOT_DEV after unexporting it in the previous patch, as requested time ago by Christoph Hellwig. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Christoph Hellwig Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a0d43df931870997467042931e8fb7657375d327 tree 1ef8099b25195a7612f0ba187b3c622f0cca9264 parent 20d0021394c1b070bf04b22c5bc8fdb437edd4c5 author Paolo 'Blaisorblade' Giarrusso Thu, 14 Jul 2005 00:33:43 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:25 -0700 [PATCH] uml: hostfs: unuse ROOT_DEV Minimal patch removing uses of ROOT_DEV; next patch unexports it. I've opposed this, but I've planned to reintroduce the functionality without using ROOT_DEV. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Christoph Hellwig Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 20d0021394c1b070bf04b22c5bc8fdb437edd4c5 tree 283d0cd3bfdaec49ed2b29d568f5ceca5e3f1d2a parent ecc354a90af90a80dcaccc750f5f3e5e7c83112d author Paolo 'Blaisorblade' Giarrusso Thu, 14 Jul 2005 00:33:43 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:25 -0700 [PATCH] uml: allow building as 32-bit binary on 64bit host This patch makes the command: make ARCH=um SUBARCH=i386 work on x86_64 hosts (with support for building 32-bit binaries). This is especially needed since 64-bit UMLs don't support 32-bit emulation for guest binaries, currently. This has been tested in all possible cases and works. Only exception is that I've built but not tested a 64-bit binary, because I hadn't a 64-bit filesystem available. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ecc354a90af90a80dcaccc750f5f3e5e7c83112d tree 71f60a11ff19d4e5078731a7fae39972a745c3c5 parent 8e0a21812427313f8ee8521688e81bfcc6f207a2 author Paolo 'Blaisorblade' Giarrusso Thu, 14 Jul 2005 00:33:41 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:25 -0700 [PATCH] uml: reintroduce pcap support The pcap support was not working because of some linking problems (expressing the construct in Kbuild was a bit difficult) and because there was no user request. Now that this has come back, here's the support. This has been tested and works on both 32 and 64-bit hosts, even when "cross-"building 32-bit binaries. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8e0a21812427313f8ee8521688e81bfcc6f207a2 tree 356769be4834e02ce77850329896fe35dc2e4c1e parent 1c30385ae479ec4774bdc1048726aeb15cde0d21 author Paolo 'Blaisorblade' Giarrusso Thu, 14 Jul 2005 00:33:41 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:25 -0700 [PATCH] uml: fix hppfs error path Fix the error message to refer to the error code, i.e. err, not count, plus add some cosmetical fixes. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1c30385ae479ec4774bdc1048726aeb15cde0d21 tree c777f2a3210b60d19074c30940dfdbc9caa711bf parent 2e5e55923e315e8198f46f24f7ca37e1fd9aa102 author Paolo 'Blaisorblade' Giarrusso Thu, 14 Jul 2005 00:33:38 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:24 -0700 [PATCH] uml: gcc 2.95 fix and Makefile cleanup 1) Cleanup an ugly hyper-nested code in Makefile (now only the arith. expression is passed through the host bash). 2) Fix a problem with GCC 2.95: according to a report from Raphael Bossek, .remap_data : { arch/um/sys-SUBARCH/unmap_fin.o (.data .bss) } is expanded into: .remap_data : { arch/um/sys-i386 /unmap_fin.o (.data .bss) } (because I didn't use ## to join the two tokens), thus stopping linking. Pass the whole path from the Makefile as a simple and nice fix. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Raphael Bossek Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e5e55923e315e8198f46f24f7ca37e1fd9aa102 tree 251aa6211d8d822350bed40cc021c9bf710110a6 parent 1feb8d2d7396748fb3bd6795d09bbfbdd4c03dff author Paolo 'Blaisorblade' Giarrusso Thu, 14 Jul 2005 00:33:37 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:24 -0700 [PATCH] uml: consolidate modify_ldt *) Reorganize the two cases of sys_modify_ldt to share all the reasonably common code. *) Avoid memory allocation when unneeded (i.e. when we are writing and the passed buffer size is known), thus not returning ENOMEM (which isn't allowed for this syscall, even if there is no strict "specification"). *) Add copy_{from,to}_user to modify_ldt for TT mode. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1feb8d2d7396748fb3bd6795d09bbfbdd4c03dff tree 73d7dbb979a107859fb40730555cb10ca6b4cbbb parent bcb01b8a67476e6f748086e626df8424cc27036d author Paolo 'Blaisorblade' Giarrusso Thu, 14 Jul 2005 00:33:36 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:24 -0700 [PATCH] uml: workaround host bug in "TT mode vs. NPTL link fix" A big bug has been diagnosed on hosts running the SKAS patch and built with CONFIG_REGPARM, due to some missing prevent_tail_call(). On these hosts, this workaround is needed to avoid triggering that bug, because "to" is kept by GCC only in EBX, which is corrupted at the return of mmap2(). Since to trigger this bug int 0x80 must be used when doing the call, it rarely manifests itself, so I'd prefer to get this merged to workaround that host bug, since it should cause no functional change. Still, you might prefer to drop it, I'll leave this to you. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bcb01b8a67476e6f748086e626df8424cc27036d tree 02b2f7931e6d62273dc866863f600ee0b2f945b5 parent 3952db66efee4f22f3c6a0fd02a1e7071556a8d6 author Paolo 'Blaisorblade' Giarrusso Thu, 14 Jul 2005 00:33:34 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:24 -0700 [PATCH] uml: fix lvalue for gcc4 Russell King This construct is refused by GCC 4, so here's the (corrected) fix. Thanks to Russell for noticing a stupid mistake I did when first sending this. As he noted, the code is largely suboptimal however it currently works, and will be fixed shortly. Just read the access_ok check on fp which is NULL, or the pointer arithmetic below which should be done with a cast to void*: frame = (struct rt_sigframe __user *) round_down(stack_top - sizeof(struct rt_sigframe), 16) - 8; The code shows clearly that has been taken from arch/x86_64/kernel/signal.c:setup_rt_frame(), maybe in a bit of a hurry. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3952db66efee4f22f3c6a0fd02a1e7071556a8d6 tree 8dd07e8fb5b725d1ba8c43e9f66ad89f84093a4b parent 514fd7fd01d378a7b5584c657d9807fc28f22079 author Michael Krufky Thu, 14 Jul 2005 00:33:33 -0700 committer Linus Torvalds Thu, 14 Jul 2005 09:00:24 -0700 [PATCH] dvb: LGDT3302 QAM lock bug fix Fix QAM lock bug. Previously, it was necessary to first scan in VSB before attempting to get a QAM lock. Signed-off-by: Mac Michaels Signed-off-by: Michael Krufky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 514fd7fd01d378a7b5584c657d9807fc28f22079 tree bda3910b7737a4fac464792657ffedcba185d799 parent 1e279dd855d15b72364b4103f872d67d8592647e parent 99ad25a313bda566a346b46a6015afa65bc0a02b author Linus Torvalds Wed, 13 Jul 2005 15:48:33 -0700 committer Linus Torvalds Wed, 13 Jul 2005 15:48:33 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6 commit 1e279dd855d15b72364b4103f872d67d8592647e tree 088ef616453b91b6915e0576d233762a1e5a78d3 parent 3720bd8b1e16b41b9ec640bf91f12e1a1b5cb961 author Miles Bader Wed, 13 Jul 2005 14:40:03 +0900 committer Linus Torvalds Wed, 13 Jul 2005 12:25:48 -0700 [PATCH] v850: Align ___start___param to match parameter alignment Signed-off-by: Miles Bader Signed-off-by: Linus Torvalds commit 3720bd8b1e16b41b9ec640bf91f12e1a1b5cb961 tree fecdaa69be5fc1f934909b89a6e3ae2c79241dfe parent a61caa8523a76e497f6b2a05350c892bc5ee402c parent 6a8b4d319c52f8a3fdca46b185d001fbf0939911 author Linus Torvalds Wed, 13 Jul 2005 12:19:30 -0700 committer Linus Torvalds Wed, 13 Jul 2005 12:19:30 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6 commit 99ad25a313bda566a346b46a6015afa65bc0a02b tree b9443fed1ab74f320c4ee0791864ee96d7c069df parent f62c4a96f74d6c6dd56d1742697e94a5c2085e87 parent 9a556e89081b0c1c2f83cee915363b15a68a6f2d author Tony Luck Wed, 13 Jul 2005 12:15:43 -0700 committer Tony Luck Wed, 13 Jul 2005 12:15:43 -0700 Auto merge with /home/aegl/GIT/linus commit f62c4a96f74d6c6dd56d1742697e94a5c2085e87 tree 488dc6db60c7c3e8ef10fd79f175cff1a5426a4c parent 59a0a8aa6ab6e46926e8d12694593267c0869440 author David Mosberger-Tang Tue, 12 Jul 2005 21:51:00 -0700 committer Tony Luck Wed, 13 Jul 2005 11:56:32 -0700 [IA64] Make PCDP work again. Mark's patch added "attribute((packed))" for pcdp_uart, without accounting for the fact that the structure definition _relied_ on implicit padding by 6 bytes. Fix is to make the padding explicit. Signed-off-by: David Mosberger-Tang Signed-off-by: Tony Luck commit 59a0a8aa6ab6e46926e8d12694593267c0869440 tree e0ceb39701ee5018f95a44904dde6c7b7aa82068 parent 7c2a6c62c013a4ea57243536fc7f3987e4ba04bc author Dean Nelson Wed, 13 Jul 2005 05:45:00 -0700 committer Tony Luck Wed, 13 Jul 2005 11:52:45 -0700 [IA64] fix call of smp_processor_id() by XPC while XPC calls smp_processor_id() twice from xpc_setup_infrastructure() with preemption enabled, which gets flagged if 'DEBUG_PREEMPT=y'. This patch replaces the two calls to smp_processor_id() by a single call to raw_smp_processor_id() since any CPU within the partition will do. Signed-off-by: Dean Nelson Acked-by: Christoph Hellwig Signed-off-by: Tony Luck commit a61caa8523a76e497f6b2a05350c892bc5ee402c tree d4fb2ca050a31e47adf45e811017964c46ccf38c parent f264cc28245d4d635d586be8c2148140726756dd author Geert Uytterhoeven Wed, 13 Jul 2005 12:56:42 +0200 committer Linus Torvalds Wed, 13 Jul 2005 11:44:27 -0700 [PATCH] Amiga joystick: Fix typo introduced by the open/close race fixes Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit f264cc28245d4d635d586be8c2148140726756dd tree b1ab054289acd3054e54d3caabaadaf1455f2d58 parent 96e2844999f99878fc5b03b81ccaa60580005b81 author Olof Johansson Wed, 13 Jul 2005 01:11:44 -0700 committer Linus Torvalds Wed, 13 Jul 2005 11:25:25 -0700 [PATCH] ppc64: add 970MP PVR Add PVR value and tests for 970MP. Also switch to a simpler (but slightly longer) check at init time for simplicity. Signed-off-by: Olof Johansson Cc: Benjamin Herrenschmidt Acked-by: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 96e2844999f99878fc5b03b81ccaa60580005b81 tree 353c1bc9a5602d556e6741f4a261010cde45e93b parent f13487c66c75f5db004a0631047309d9e7c5aab7 author David Gibson Wed, 13 Jul 2005 01:11:42 -0700 committer Linus Torvalds Wed, 13 Jul 2005 11:25:25 -0700 [PATCH] ppc64: kill bitfields in ppc64 hash code This patch removes the use of bitfield types from the ppc64 hash table manipulation code. Signed-off-by: David Gibson Acked-by: Stephen Rothwell Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f13487c66c75f5db004a0631047309d9e7c5aab7 tree 19585562d0ffb0923ed6c2d829d44f10eb619482 parent 7ee91ec14bd4def036b4084da29869382078e44b author Olaf Hering Wed, 13 Jul 2005 01:11:41 -0700 committer Linus Torvalds Wed, 13 Jul 2005 11:25:25 -0700 [PATCH] ppc32: make -j12 all fails in uImage target make -j zImage may call if_changed twice at the same time, the result is a corrupted vmlinux.gz Write to a temporary file for the time being until someone with make skills fix the serialization properly. Signed-off-by: Olaf Hering Cc: Benjamin Herrenschmidt Cc: Sam Ravnborg Acked-by: Tom Rini Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7ee91ec14bd4def036b4084da29869382078e44b tree 5d4a99f6c0255184328c47f33258088b2ef0f8b1 parent 068e1b94bbd268f375349f68531829c8b7c210bc author Steve Dickson Wed, 13 Jul 2005 01:10:47 -0700 committer Linus Torvalds Wed, 13 Jul 2005 11:25:24 -0700 [PATCH] NFS: procfs/sysctl interfaces for lockd do not work on x86_64 Allow the setting of NLM timeouts and grace periods through the proc and sysclt interfaces on x86_64 architectures Signed-off-by: Steve Dickson Acked-by: Trond Myklebust Cc: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 068e1b94bbd268f375349f68531829c8b7c210bc tree 310708cce88df2f72a5f98d1cb67dc1d8fe19171 parent ddca3b80cef36cc668f924ef5154a79acb19ebd7 author Martin Schwidefsky Wed, 13 Jul 2005 01:10:46 -0700 committer Linus Torvalds Wed, 13 Jul 2005 11:25:24 -0700 [PATCH] s390: fadvise hint values. Add special case for the POSIX_FADV_DONTNEED and POSIX_FADV_NOREUSE hint values for s390-64. The user space values in the s390-64 glibc headers for these two defines have always been 6 and 7 instead of 4 and 5. All 64 bit applications therefore use the "wrong" values. To get these applications working without recompiling the kernel needs to accept the "wrong" values. Since the values for s390-31 are 4 and 5 the compat wrapper for fadvise64 and fadvise64_64 need to rewrite the values for 31 bit system calls. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ddca3b80cef36cc668f924ef5154a79acb19ebd7 tree 2cfb8ac6837682d975a1cb761360977ac54a6aef parent 88bd5121d635136e01369141367f315665534b3c author Guillaume Autran Wed, 13 Jul 2005 01:10:45 -0700 committer Linus Torvalds Wed, 13 Jul 2005 11:25:24 -0700 [PATCH] ppc32: fix destroy_context() race condition Fix for a race condition when a task gets preempted by another task while executing the destroy_context(...) in a FEW_CONTEXTS environment. mm->context == NO_CONTEXT but the context_map may indicate all contexts are in use. The solution to this problem is to disable kernel preemption while destroying a MMU context. Signed-off-by: Guillaume Autran Acked-by: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 88bd5121d635136e01369141367f315665534b3c tree 33de8dda3d77ebf7bf48864c464a36665f66497c parent 9a556e89081b0c1c2f83cee915363b15a68a6f2d author Anton Altaparmakov Wed, 13 Jul 2005 01:10:44 -0700 committer Linus Torvalds Wed, 13 Jul 2005 11:25:24 -0700 [PATCH] Fix soft lockup due to NTFS: VFS part and explanation Something has changed in the core kernel such that we now get concurrent inode write outs, one e.g via pdflush and one via sys_sync or whatever. This causes a nasty deadlock in ntfs. The only clean solution unfortunately requires a minor vfs api extension. First the deadlock analysis: Prerequisive knowledge: NTFS has a file $MFT (inode 0) loaded at mount time. The NTFS driver uses the page cache for storing the file contents as usual. More interestingly this file contains the table of on-disk inodes as a sequence of MFT_RECORDs. Thus NTFS driver accesses the on-disk inodes by accessing the MFT_RECORDs in the page cache pages of the loaded inode $MFT. The situation: VFS inode X on a mounted ntfs volume is dirty. For same inode X, the ntfs_inode is dirty and thus corresponding on-disk inode, which is as explained above in a dirty PAGE_CACHE_PAGE belonging to the table of inodes ($MFT, inode 0). What happens: Process 1: sys_sync()/umount()/whatever... calls __sync_single_inode() for $MFT -> do_writepages() -> write_page for the dirty page containing the on-disk inode X, the page is now locked -> ntfs_write_mst_block() which clears PageUptodate() on the page to prevent anyone else getting hold of it whilst it does the write out (this is necessary as the on-disk inode needs "fixups" applied before the write to disk which are removed again after the write and PageUptodate is then set again). It then analyses the page looking for dirty on-disk inodes and when it finds one it calls ntfs_may_write_mft_record() to see if it is safe to write this on-disk inode. This then calls ilookup5() to check if the corresponding VFS inode is in icache(). This in turn calls ifind() which waits on the inode lock via wait_on_inode whilst holding the global inode_lock. Process 2: pdflush results in a call to __sync_single_inode for the same VFS inode X on the ntfs volume. This locks the inode (I_LOCK) then calls write-inode -> ntfs_write_inode -> map_mft_record() -> read_cache_page() of the page (in page cache of table of inodes $MFT, inode 0) containing the on-disk inode. This page has PageUptodate() clear because of Process 1 (see above) so read_cache_page() blocks when tries to take the page lock for the page so it can call ntfs_read_page(). Thus Process 1 is holding the page lock on the page containing the on-disk inode X and it is waiting on the inode X to be unlocked in ifind() so it can write the page out and then unlock the page. And Process 2 is holding the inode lock on inode X and is waiting for the page to be unlocked so it can call ntfs_readpage() or discover that Process 1 set PageUptodate() again and use the page. Thus we have a deadlock due to ifind() waiting on the inode lock. The only sensible solution: NTFS does not care whether the VFS inode is locked or not when it calls ilookup5() (it doesn't use the VFS inode at all, it just uses it to find the corresponding ntfs_inode which is of course attached to the VFS inode (both are one single struct); and it uses the ntfs_inode which is subject to its own locking so I_LOCK is irrelevant) hence we want a modified ilookup5_nowait() which is the same as ilookup5() but it does not wait on the inode lock. Without such functionality I would have to keep my own ntfs_inode cache in the NTFS driver just so I can find ntfs_inodes independent of their VFS inodes which would be slow, memory and cpu cycle wasting, and incredibly stupid given the icache already exists in the VFS. Below is a patch that does the ilookup5_nowait() implementation in fs/inode.c and exports it. ilookup5_nowait.diff: Introduce ilookup5_nowait() which is basically the same as ilookup5() but it does not wait on the inode's lock (i.e. it omits the wait_on_inode() done in ifind()). This is needed to avoid a nasty deadlock in NTFS. Signed-off-by: Anton Altaparmakov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9a556e89081b0c1c2f83cee915363b15a68a6f2d tree 74e2f68c4d04ab0fcf05dbd4f82c14169d639405 parent 5995f16b4a464c8a57de7c9d5ddf4758dbacad41 author Robert Love Wed, 13 Jul 2005 13:49:23 -0400 committer Linus Torvalds Wed, 13 Jul 2005 11:09:31 -0700 [PATCH] inotify: misc cleanup Really simple, basic cleanup. Signed-off-by: Robert Love Signed-off-by: Linus Torvalds commit 5995f16b4a464c8a57de7c9d5ddf4758dbacad41 tree e26de11916f1f6234f954b262837501aca263da7 parent 0399cb08c54708db231d616f106f64d920e0b723 author Robert Love Wed, 13 Jul 2005 12:38:39 -0400 committer Linus Torvalds Wed, 13 Jul 2005 11:09:31 -0700 [PATCH] inotify: event ordering This rearranges the event ordering for "open" to be consistent with the ordering of the other events. Signed-off-by: Robert Love Signed-off-by: Linus Torvalds commit 0399cb08c54708db231d616f106f64d920e0b723 tree f0424d43c578f7c5c1e7aa6ea6ca1c906c7ac289 parent 153f805781d35c91ab2f54aa2b8930cc4cfc7e89 author Robert Love Wed, 13 Jul 2005 12:38:18 -0400 committer Linus Torvalds Wed, 13 Jul 2005 11:09:31 -0700 [PATCH] inotify: move sysctl This moves the inotify sysctl knobs to "/proc/sys/fs/inotify" from "/proc/sys/fs". Also some related cleanup. Signed-off-by: Robert Love Signed-off-by: Linus Torvalds commit 153f805781d35c91ab2f54aa2b8930cc4cfc7e89 tree 90bb6279bec053f942aed60ecfb0580c79b0e422 parent c327ff6250fb558659ad689fe33f50524eda74e3 author James Bottomley Wed, 13 Jul 2005 09:38:05 -0400 committer Linus Torvalds Wed, 13 Jul 2005 11:07:54 -0700 [PATCH] fix voyager subarchitecture EXPORT_SYMBOL breakage caused by i386_ksym reduction This patch: [PATCH] Remove i386_ksyms.c, almost made files like smp.c do their own EXPORT_SYMBOLS. This means that all subarchitectures that override these symbols now have to do the exports themselves. This patch adds the exports for voyager (which is the most affected since it has a separate smp harness). However, someone should audit all the other subarchitectures to see if any others got broken. Signed-off-by: James Bottomley Signed-off-by: Linus Torvalds commit c327ff6250fb558659ad689fe33f50524eda74e3 tree 57e0ed5a753c55f1693d7fe8628b4411ab5ae71d parent c0ac515e2951dd2a999cfd21dea3fdc1055f1573 parent 59192ed9e7aa81b06a1803661419f7261afca1ad author Linus Torvalds Wed, 13 Jul 2005 10:37:36 -0700 committer Linus Torvalds Wed, 13 Jul 2005 10:37:36 -0700 Merge head 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/shaggy/jfs-2.6 commit c0ac515e2951dd2a999cfd21dea3fdc1055f1573 tree cb4f8124f9302c3ad02037451b89fe98dca6b4ed parent 6cd59f7a4119fef124677827a9b30684c2c8e674 author Jeff Mahoney Wed, 13 Jul 2005 11:55:42 -0400 committer Linus Torvalds Wed, 13 Jul 2005 10:28:43 -0700 [PATCH] Lindent: ignore .indent.pro When I recently submitted a Lindent patch, it turned out that my .indent.pro options were also applied to the tree. This patch directs indent(1) to ignore the .indent.pro directives and only use options specified on the command line. Signed-off-by: Jeff Mahoney Signed-off-by: Linus Torvalds commit 6cd59f7a4119fef124677827a9b30684c2c8e674 tree 084162f271f09b0d4787b92ae414cf0cc310f521 parent c32511e2718618f0b53479eb36e07439aa363a74 parent 73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc author Linus Torvalds Wed, 13 Jul 2005 10:12:50 -0700 committer Linus Torvalds Wed, 13 Jul 2005 10:12:50 -0700 Merge /home/torvalds/linux-2.6-arm commit 6a8b4d319c52f8a3fdca46b185d001fbf0939911 tree cad5d67d42c73f690f4c3638cedebd1ec33273b6 parent 1b3035b7fcc72b6b36f2a3634dad832eb2453ce8 author Joern Engel Wed, 13 Jul 2005 16:45:43 +0100 committer Thomas Gleixner Wed, 13 Jul 2005 19:04:04 +0200 [MTD] cfi_cmdset_0002: Plugged a mem leak. Signed-off-by: Joern Engel Signed-off-by: Thomas Gleixner commit 59192ed9e7aa81b06a1803661419f7261afca1ad tree 31f592365ad2ecf5eb606de10290da502fc7eb74 parent 6211502d7ee9e515e4458d0c0ebfbb70553dc7de author Ian Dall Wed, 13 Jul 2005 09:15:18 -0500 committer Dave Kleikamp Wed, 13 Jul 2005 09:15:18 -0500 JFS: Need to be root to create files with security context It turns out this is due to some inverted logic in xattr.c Signed-off-by: Dave Kleikamp commit 6211502d7ee9e515e4458d0c0ebfbb70553dc7de tree 24ab6b567f793f8dd1c1e3458769290df2bf8f52 parent f7f24758ac98a506770bc5910d33567610fa3403 author Dave Kleikamp Wed, 13 Jul 2005 09:07:53 -0500 committer Dave Kleikamp Wed, 13 Jul 2005 09:07:53 -0500 JFS: Allow security.* xattrs to be set on symlinks All of the different xattr namespaces have different rules. user.* and ACL's are not allowed on symlinks, and since these were the first xattrs implemented, I assumed there was no need to support xattrs on symlinks. This one-line patch should fix it. Signed-off-by: Dave Kleikamp commit f7f24758ac98a506770bc5910d33567610fa3403 tree ff7fad3d01bf9dc2e2e54b908f9fca4891e1ee72 parent b38a3ab3d1bb0dc3288f73903d4dc4672b5cd2d0 parent c32511e2718618f0b53479eb36e07439aa363a74 author Dave Kleikamp Wed, 13 Jul 2005 08:57:38 -0500 committer Dave Kleikamp Wed, 13 Jul 2005 08:57:38 -0500 Merge with /home/shaggy/git/linus-clean/ Signed-off-by: Dave Kleikamp commit 1b3035b7fcc72b6b36f2a3634dad832eb2453ce8 tree 728174d72943cc9b981a5843553551df62eddc41 parent a98a5d04f400ad112e59cadd739dbabf89417e60 parent c32511e2718618f0b53479eb36e07439aa363a74 author Thomas Gleixner Wed, 13 Jul 2005 10:45:00 +0200 committer Thomas Gleixner Wed, 13 Jul 2005 10:45:00 +0200 Merge with rsync://fileserver/linux commit 7c2a6c62c013a4ea57243536fc7f3987e4ba04bc tree 02e3e1d9888f81110ba85bef531e5c695f6064ce parent 08357f82d4decc48bbfd39ae30d5fe0754f7f576 author Christoph Lameter Tue, 12 Jul 2005 16:03:00 -0700 committer Tony Luck Tue, 12 Jul 2005 16:12:55 -0700 [IA64] Altix pcibus_to_node implementation The Altix subarch does not provide node information via ACPI. Instead hooks are used to fixup pci structures. This patch determines the nodes for Altix PCI busses. Remote Bridges: --------------- Altix supports remote I/O nodes without memory or processors but with bridges. The TIOCA type of bridge is an AGP bridge and the PROM provides information about the closest node. That information will be returned by pcibus_to_node. The TIOCP remote bridge type is a PCI bridge but the PROM does not provide a closest node id. pcibus_to_node will return -1 for devices on those bridges meaning that device control structures may be allocated on any node. Safeguard: ---------- Should the fixups result in invalid node information for a pci controller then a warning will be printed and pcibus_to_node will return -1. This patch also fixes the "FIXME" in sn_dma_alloc_coherent. This means that dma_alloc_coherent will now use alloc_pages_node to allocate memory local to the node that the PCI device is connected to. Signed-off-by: Christoph Lameter Signed-off-by: Tony Luck commit a98a5d04f400ad112e59cadd739dbabf89417e60 tree 5eeb7f45c0090de40c7523e2b9dfd5e86b22169e parent 751382dd5cb2702368d281a50b55c2d6c4e8fbfc parent 7ac3db59fd4410405ce55e2a25c397aec440d8da author Todd Poynor Tue, 12 Jul 2005 03:34:39 +0100 committer Thomas Gleixner Wed, 13 Jul 2005 00:58:44 +0200 Merge with rsync://fileserver/linux commit 08357f82d4decc48bbfd39ae30d5fe0754f7f576 tree c8516a8f208e1cb253bd33f41857b0699104b130 parent 60a762b6a6dec17cc4339b60154902fd04c2f9f2 author Zoltan Menyhart Fri, 03 Jun 2005 05:36:00 -0700 committer Tony Luck Tue, 12 Jul 2005 15:33:18 -0700 [IA64] improve flush_icache_range() Check with PAL to see what the i-cache line size is for each level of the cache, and so use the correct stride when flushing the cache. Acked-by: David Mosberger Signed-off-by: Tony Luck commit 751382dd5cb2702368d281a50b55c2d6c4e8fbfc tree 1d9195fe0bf264668b92fe2b2c36a4d76d253162 parent b62205986a73a40e4fc174d2ef668e3895e925bc author Todd Poynor Tue, 12 Jul 2005 03:34:39 +0100 committer Thomas Gleixner Wed, 13 Jul 2005 00:03:19 +0200 [JFFS2] Avoid compiler warnings when JFFS2_FS_WRITEBUFFER=n Signed-off-by: Todd Poynor Signed-off-by: Thomas Gleixner commit b62205986a73a40e4fc174d2ef668e3895e925bc tree e5754d64dcdf508dd4f3602135c963990d261411 parent e4fef6618992bea48b7856ebbd236796b744964f author Artem B. Bityuckiy Tue, 12 Jul 2005 17:37:12 +0100 committer Thomas Gleixner Wed, 13 Jul 2005 00:02:33 +0200 [JFFS2] Init locks early during mount In case of a mount error locks might be uninitialized but accessed by the resulting call to jffs2_kill_sb(). Signed-off-by: Artem B. Bityuckiy Signed-off-by: Thomas Gleixner commit e4fef6618992bea48b7856ebbd236796b744964f tree fd0f89f0a1f5c955aec128843bc0663b326ff830 parent 86ffc0d5f5f0c8a6fe70eccade3f7ae8e9630edf author Artem B. Bityuckiy Sun, 10 Jul 2005 16:15:36 +0100 committer Thomas Gleixner Tue, 12 Jul 2005 23:58:26 +0200 [JFFS2] Rename function and update comments We recently changed the method of collecting and sorting of tmp_dnode objects to use a temporary RB-tree instead of a temporary list. Rename function and update comments. Signed-off-by: Artem B. Bityuckiy Signed-off-by: Thomas Gleixner commit 86ffc0d5f5f0c8a6fe70eccade3f7ae8e9630edf tree bef3020557487dd8755ca0d7b93aa46e0ddbf11a parent 336d2ff7115bd4391108a16f476c739cb4a505b0 author Artem B. Bityuckiy Sun, 10 Jul 2005 14:13:58 +0100 committer Thomas Gleixner Tue, 12 Jul 2005 23:56:40 +0200 [JFFS2] Remove needless variable initialization Signed-off-by: Artem B. Bityuckiy Signed-off-by: Thomas Gleixner commit 336d2ff7115bd4391108a16f476c739cb4a505b0 tree ac5dbf60deb2b97ec3cc0f0278da24efecacef21 parent 1ca70351af02b1f0eb9cd2e7eb7a547f8ad5d893 author Artem B. Bityuckiy Thu, 07 Jul 2005 16:45:32 +0100 committer Thomas Gleixner Tue, 12 Jul 2005 23:55:05 +0200 [JFFS2] Avoid alloc/dealloc for zero sized nodes Signed-off-by: Artem B. Bityuckiy Signed-off-by: Thomas Gleixner commit 60a762b6a6dec17cc4339b60154902fd04c2f9f2 tree d01918a446ad451a1ff5226f04e1747a6e48eb85 parent 514604c6d1779c55d3e97dc4e9a71c117c1ccbcd author Greg Edwards Tue, 28 Jun 2005 11:13:00 -0700 committer Tony Luck Tue, 12 Jul 2005 14:13:08 -0700 [IA64] remove CONFIG_IA64_SGI_SN_SIM This patch removes the CONFIG_IA64_SGI_SN_SIM option entirely, allowing any kernel bootable on sn2 to also be booted in the simulator. Boot tested on Altix and HP rx2600. Signed-off-by: Greg Edwards Signed-off-by: Tony Luck commit 514604c6d1779c55d3e97dc4e9a71c117c1ccbcd tree 19241b4db64f1da60c0dd594606c5d5fba8b254f parent 1604d9c8f8dffafe3a077dc5ae7c935d2318bcf6 author Christoph Lameter Thu, 07 Jul 2005 16:59:00 -0700 committer Tony Luck Tue, 12 Jul 2005 11:04:22 -0700 [IA64] pcibus_to_node implementation for IA64 pcibus_to_node provides a way for the Linux kernel to identify to which node a certain pcibus connects to. Allocations of control structures for devices can then be made on the node where the pci bus is located to allow local access during interrupt and other device manipulation. This patch provides a new "node" field in the the pci_controller structure. The node field will be set based on ACPI information (thanks to Alex Williamson Signed-off-by: Tony Luck commit 1ca70351af02b1f0eb9cd2e7eb7a547f8ad5d893 tree 2f00b49a065e1da68ea446b24c44a4b5bad1474e parent 97f927a4d7dbccde0a854a62c3ea54d90bae8679 author Thomas Gleixner Tue, 12 Jul 2005 17:51:06 +0200 committer Thomas Gleixner Tue, 12 Jul 2005 17:51:06 +0200 [MTD] Make XIP support depend on CONFIG_ARM ARM is the only known user of this at the moment. Prevent allyes builds for other archs from failing Signed-off-by: Thomas Gleixner commit 73eb7d9e8cfd16813eec94d0ec8fa2a5262a85cc tree 79c81babb78c36f94f677ee587ab884903fffa12 parent e11b2236eace94ad9a2e421904742e83976405ed author Russell King Mon, 11 Jul 2005 19:42:58 +0100 committer Russell King Mon, 11 Jul 2005 19:42:58 +0100 [PATCH] ARM SMP: Initialise cpu_present_map Rather than relying on the fixup code in init/main.c, explicitly initialise cpu_present_map. Signed-off-by: Russell King commit e11b2236eace94ad9a2e421904742e83976405ed tree d5882b4b06bf7a9310f993bf1935d720e6be9e7d parent d12734d14e5602816f0b16b17a8cef5ea70afb5a author Russell King Mon, 11 Jul 2005 19:26:31 +0100 committer Russell King Mon, 11 Jul 2005 19:26:31 +0100 [PATCH] ARM SMP: We list IRQs for present CPUs, not online CPUs Signed-off-by: Russell King commit d12734d14e5602816f0b16b17a8cef5ea70afb5a tree cb6793f2bd1d5bbc53562c690e3e09351439e98a parent 7343c9ba8ed9d504cd2daf960da58971c6631601 author Russell King Mon, 11 Jul 2005 17:38:36 +0100 committer Russell King Mon, 11 Jul 2005 17:38:36 +0100 [PATCH] ARM SMP: Rename cpu_present_mask to cpu_possible_map The kernel's terminology for this is cpu_possible_map not cpu_present_mask. Signed-off-by: Russell King commit 7343c9ba8ed9d504cd2daf960da58971c6631601 tree 7f6b6b37f444f685bfbd82f0ce19305e600b660c parent 5c23804a0941a111752fdacefe0bea2db1b4d93f author Olaf Hering Mon, 11 Jul 2005 10:17:06 +0100 committer Russell King Mon, 11 Jul 2005 10:17:06 +0100 [PATCH] ARM: remove linux/version.h include from arch/arm Changing CONFIG_LOCALVERSION rebuilds too much, for no appearent reason. Signed-off-by: Olaf Hering Signed-off-by: Russell King commit b38a3ab3d1bb0dc3288f73903d4dc4672b5cd2d0 tree 31d017dd1f9f4a8ca3e80d25d110c64ae82d4aae parent f5f287738bddf38ec9ca79344f00dab675e1bbf5 author Dave Kleikamp Mon, 27 Jun 2005 15:35:37 -0500 committer Dave Kleikamp Mon, 27 Jun 2005 15:35:37 -0500 JFS: Code cleanup - getting rid of never-used debug code I'm finally getting around to cleaning out debug code that I've never used. There has always been code ifdef'ed out by _JFS_DEBUG_DMAP, _JFS_DEBUG_IMAP, _JFS_DEBUG_DTREE, and _JFS_DEBUG_XTREE, which I have personally never used, and I doubt that anyone has since the design stage back in OS/2. There is also a function, xtGather, that has never been used, and I don't know why it was ever there. Signed-off-by: Dave Kleikamp commit f5f287738bddf38ec9ca79344f00dab675e1bbf5 tree c8144a3906f6904f7cf18c4520976c79a1e15b0a parent a8ad86f2dc46356f87be1327dabc18bdbda32f50 author Sonny Rao Thu, 23 Jun 2005 16:57:56 -0500 committer Dave Kleikamp Thu, 23 Jun 2005 16:57:56 -0500 JFS: performance patch Basically, we saw a large amount of time spent in the jfs_strfromUCS_le() function, mispredicting the branch inside the loop, so I just added some unlikely modifiers to the if statements to re-ordered the code. Again, these simple changes provided > 2 % on spec-sfs, so please consider it for inclusion. Signed-off-by: Dave Kleikamp