commit c25d5180441e344a3368d100c57f0a481c6944f7 tree 1aa053650b49f987effcbc91184c9a4208d402b1 parent 0ca9caae2d05ee0c4878aa3e2619cd23f4ad4cb4 parent 9a244b95ddb62a17b62f4b061b6e13ca4d177942 author Linus Torvalds Wed, 11 Oct 2006 15:30:14 -0700 committer Linus Torvalds Wed, 11 Oct 2006 15:30:14 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Pass NULL not 0 for pointer value. [MIPS] IP27: Make declaration of setup_replication_mask a proper prototype. [MIPS] BigSur: More useful defconfig. [MIPS] Cleanup definitions of speed_t and tcflag_t. [MIPS] Fix compilation warnings in arch/mips/sibyte/bcm1480/smp.c [MIPS] Optimize and cleanup get_saved_sp, set_saved_sp [MIPS] does not need pt_regs anymore. [MIPS] Workaround for bug in gcc -EB / -EL options. [MIPS] Fix timer setup for Jazz commit 9a244b95ddb62a17b62f4b061b6e13ca4d177942 tree 84cad1da5dda2923836c1f99da85b03a72e1ad62 parent c11b3c1bc0250027ff05665898f8d8eec40b7e49 author Ralf Baechle Wed, 11 Oct 2006 19:30:03 +0100 committer Ralf Baechle Wed, 11 Oct 2006 19:31:00 +0100 [MIPS] Pass NULL not 0 for pointer value. Signed-off-by: Ralf Baechle commit c11b3c1bc0250027ff05665898f8d8eec40b7e49 tree 1346fc79adcdffaa5818da2216e9f44bd718383e parent 67672f5b1f90ff19b970727b3fe2fa2b3cee3bef author Ralf Baechle Wed, 11 Oct 2006 18:35:33 +0100 committer Ralf Baechle Wed, 11 Oct 2006 19:31:00 +0100 [MIPS] IP27: Make declaration of setup_replication_mask a proper prototype. Signed-off-by: Ralf Baechle commit 67672f5b1f90ff19b970727b3fe2fa2b3cee3bef tree 2c81f5365241b31fc7cbbc89cf268521ab4e80c9 parent 04d4d7d5e36957b2d941310fc8243aa7bf036f3b author Ralf Baechle Wed, 11 Oct 2006 01:42:30 +0100 committer Ralf Baechle Wed, 11 Oct 2006 19:30:59 +0100 [MIPS] BigSur: More useful defconfig. Signed-off-by: Ralf Baechle commit 04d4d7d5e36957b2d941310fc8243aa7bf036f3b tree 23e8c6466515a4deaa14e6fc5cd0047a0b13e3c8 parent 472f291df59fc1c5eb3ade74a50bfa222030e736 author Ralf Baechle Wed, 11 Oct 2006 01:22:12 +0100 committer Ralf Baechle Wed, 11 Oct 2006 19:30:59 +0100 [MIPS] Cleanup definitions of speed_t and tcflag_t. Signed-off-by: Ralf Baechle commit 472f291df59fc1c5eb3ade74a50bfa222030e736 tree 1ea4b1a03af63b7db42e71ab0366f227d0e5c78b parent 9b95e629eab59ee140fe2b17bbd7fea6821c6085 author Mark Mason Tue, 10 Oct 2006 17:03:10 -0700 committer Ralf Baechle Wed, 11 Oct 2006 19:30:59 +0100 [MIPS] Fix compilation warnings in arch/mips/sibyte/bcm1480/smp.c Signed-off-by: Mark Mason Signed-off-by: Ralf Baechle commit 9b95e629eab59ee140fe2b17bbd7fea6821c6085 tree cda9a07874bd1c7ba3254addbff24bcc7f91ac7d parent dff9262ed1491a1e531dc56e687605b5e4cd488d author Atsushi Nemoto Tue, 10 Oct 2006 22:46:52 +0900 committer Ralf Baechle Wed, 11 Oct 2006 19:30:59 +0100 [MIPS] Optimize and cleanup get_saved_sp, set_saved_sp If CONFIG_BUILD_ELF64 was not selected and gcc had -msym32 option (i.e. 4.0 or newer), there is no point to use %highest, %higher for kernel symbols. This patch also fixes 64-bit SMTC version of get_saved_sp() which is broken but harmless since there is no such CPUs for now. A bonus is set_saved_sp() and SMP version of get_saved_sp() are more readable now. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit dff9262ed1491a1e531dc56e687605b5e4cd488d tree 381d0a72e40e46b097c20731e6604dd50c31a285 parent f94054121efcba573f12101a75a4be93e871b309 author Atsushi Nemoto Wed, 11 Oct 2006 01:07:01 +0900 committer Ralf Baechle Wed, 11 Oct 2006 19:30:59 +0100 [MIPS] does not need pt_regs anymore. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f94054121efcba573f12101a75a4be93e871b309 tree 0836e0e2eb24976e5c7f52309e140ce3724a1156 parent ea5742830ada301de22a68e604b48fb6107c270f author Ralf Baechle Tue, 10 Oct 2006 15:44:10 +0100 committer Ralf Baechle Wed, 11 Oct 2006 19:30:59 +0100 [MIPS] Workaround for bug in gcc -EB / -EL options. Certain gcc versions upto gcc 4.1.1 (probably 4.2-subversion as of 2006-10-10 don't properly change the the predefined symbols if -EB / -EL are used, so we kludge that here. A bug has been filed at http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29413. Signed-off-by: Ralf Baechle commit ea5742830ada301de22a68e604b48fb6107c270f tree 8cd82170cee8a45fceb86d17e179b4fe45ec4b27 parent 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 author Yoichi Yuasa Tue, 10 Oct 2006 16:56:11 +0900 committer Ralf Baechle Wed, 11 Oct 2006 19:30:58 +0100 [MIPS] Fix timer setup for Jazz Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 0ca9caae2d05ee0c4878aa3e2619cd23f4ad4cb4 tree 93323b1f7146aefb1843cb995def6c09613bb363 parent 6bf1f75bc6dabc357a29e3b3d6bd4ff00c3d5e6e parent 75e9de18f079a51fa987ef0703112d5bc125fdb7 author Linus Torvalds Wed, 11 Oct 2006 11:20:11 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:20:11 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] stacktrace bug. [S390] cio: remove casts from/to (void *). [S390] cio: Remove grace period for vary off chpid. [S390] cio: Use ccw_dev_id and subchannel_id in ccw_device_private [S390] monwriter kzalloc size. [S390] cio: add missing KERN_INFO printk header. [S390] irq change improvements. commit 6bf1f75bc6dabc357a29e3b3d6bd4ff00c3d5e6e tree 556f9fa6e4b34082f3fbf54dfbd249b29967be28 parent 60ca97584fcb98d2f1b14e4c2f12203dd5b3888e parent 701328a7b58d50d8640c21ba5fdf3170b1ddac16 author Linus Torvalds Wed, 11 Oct 2006 11:19:47 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:19:47 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: [PATCH] pata-qdi: fix le32 in data_xfer [libata] sata_promise: add PCI ID [PATCH] libata: return sense data in HDIO_DRIVE_CMD ioctl [PATCH] libata: Don't believe bogus claims in the older PIO mode register commit 60ca97584fcb98d2f1b14e4c2f12203dd5b3888e tree eccd93512a4b3b1e5cb5f721084ee51165ff4965 parent f061c5847bcc72eebf6a783f458d42092eac1b6a parent 4a1d2d81fa327d095a0a8a1f961bace5b0a2f7da author Linus Torvalds Wed, 11 Oct 2006 11:19:30 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:19:30 -0700 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (42 commits) [PATCH] Fix section mismatch in de2104x.c [PATCH] sky2: set lower pause threshold to prevent overrun [PATCH] sky2: revert pci express extensions [PATCH] skge: version 1.9 [PATCH] skge: better flow control negotiation [PATCH] skge: pause mapping for fiber [PATCH] skge: fix stuck irq when fiber down [PATCH] powerpc/cell spidernet release all descrs [PATCH] powerpc/cell spidernet DMA direction fix [PATCH] powerpc/cell spidernet variable name change [PATCH] powerpc/cell spidernet reduce DMA kicking [PATCH] powerpc/cell spidernet [PATCH] powerpc/cell spidernet refine locking [PATCH] powerpc/cell spidernet NAPI polling info. [PATCH] powerpc/cell spidernet low watermark patch. [PATCH] powerpc/cell spidernet incorrect offset [PATCH] powerpc/cell spidernet stop error printing patch. [PATCH] powerpc/cell spidernet fix error interrupt print [PATCH] powerpc/cell spidernet bogus rx interrupt bit [PATCH] Spidernet stop queue when queue is full. ... commit f061c5847bcc72eebf6a783f458d42092eac1b6a tree de423a183d943c2472fcd489338014e09760a25d parent cff52daffa080eff6353f44df418b080dacefb96 author Al Viro Wed, 11 Oct 2006 17:45:47 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:07 -0700 [PATCH] i2Output always takes kernel data now Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cff52daffa080eff6353f44df418b080dacefb96 tree 57745a059733794b7e48dd45d459b0a97385fc67 parent 9ab6a45394715918b025f2d3b799477295af4cc0 author Al Viro Wed, 11 Oct 2006 17:40:22 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:07 -0700 [PATCH] alpha_ksyms.c cleanup taken exports to actual definitions of symbols being exported. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9ab6a45394715918b025f2d3b799477295af4cc0 tree 1588c57026c6acc9ddcf5096162abdff7306b40d parent f39d88adc5daf544cf9ae666a097b595b212871e author Al Viro Wed, 11 Oct 2006 17:40:22 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:07 -0700 [PATCH] remove bogus arch-specific syscall exports Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit f39d88adc5daf544cf9ae666a097b595b212871e tree 2aad8a693ca92cb6bf416e8b5b811d600593706b parent 2db5f59ca74d911f93c39494db1581c3c93d5a29 author Al Viro Wed, 11 Oct 2006 17:28:47 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:07 -0700 [PATCH] z2_init() in non-modular case ... another victim - this time of 2.5.1-pre2 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2db5f59ca74d911f93c39494db1581c3c93d5a29 tree 0c84677574d88f413e94314b904f04d753267283 parent 2e811488cedddefb9d1df97c260b6048ea8ef835 author Al Viro Wed, 11 Oct 2006 17:28:37 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:07 -0700 [PATCH] amiga_floppy_init() in non-modular case It used to be called directly, but that got lost in 2.1.87-pre1. Similar breakage in ataflop got fixed 3 years ago, this one had gone unnoticed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2e811488cedddefb9d1df97c260b6048ea8ef835 tree b24390217e2c583099e311c678a88b33dbb1bd49 parent 437111ca381263520d23c877e55e0a83558e79da author Al Viro Wed, 11 Oct 2006 17:28:27 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:06 -0700 [PATCH] clean m68k ksyms sun3_ksyms gone, m68k_ksyms trimmed down to exports of the assembler ones, for sun3 added the missing exports of __ioremap() and iounmap(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 437111ca381263520d23c877e55e0a83558e79da tree 65d83669d20f2c5178dcd1feaae2b6d1f7941383 parent 1e5c374d3833f816b4840227c6949f689af0cb44 author Al Viro Wed, 11 Oct 2006 17:28:17 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:06 -0700 [PATCH] sun3 __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1e5c374d3833f816b4840227c6949f689af0cb44 tree e935b95f49a5a23394b18b2b122b81f289e31586 parent b971018bae94bb43ae2402f884684ad69e85f931 author Al Viro Wed, 11 Oct 2006 17:28:07 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:06 -0700 [PATCH] misc m68k __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit b971018bae94bb43ae2402f884684ad69e85f931 tree 78f3428d8235140a73a7087aed2eb0ca73fae152 parent 4b4fcaa1a9eec90b44b66a67af6e130349ba008e author Al Viro Wed, 11 Oct 2006 17:27:57 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:06 -0700 [PATCH] m68k uaccess __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4b4fcaa1a9eec90b44b66a67af6e130349ba008e tree de795abc96e90296b0b508c6a8f66882a9461366 parent fd2c903b89a6c3cec9388eb24a134ebc1be20747 author Al Viro Wed, 11 Oct 2006 17:25:45 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:06 -0700 [PATCH] misuse of strstr Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fd2c903b89a6c3cec9388eb24a134ebc1be20747 tree 497a3944481290d120052de53ac869eab89d6463 parent 12ea59e8109d7192ecb2ac994588e24b11ab0428 author Al Viro Wed, 11 Oct 2006 17:24:55 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:06 -0700 [PATCH] m32r: more __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 12ea59e8109d7192ecb2ac994588e24b11ab0428 tree c1e889ea9d8a15d06fbad1ded70ad8de2bb2b050 parent 870e75a2930a1db02c7a5c09a13edcb4e3b07838 author Al Viro Wed, 11 Oct 2006 17:24:35 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:06 -0700 [PATCH] m32r: NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 870e75a2930a1db02c7a5c09a13edcb4e3b07838 tree 3fbac020a6caa62316dd729f221b374e6b932d3a parent 7857a7f59d5d0b4e8c15606a79c0bcdbdef18ab6 author Al Viro Wed, 11 Oct 2006 17:24:45 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:06 -0700 [PATCH] m32r: signal __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7857a7f59d5d0b4e8c15606a79c0bcdbdef18ab6 tree 999604034d009efcdb7c653282429d470014116a parent 399ad77b9098ed2eb27cbfbeb6449c1caab3c18e author Al Viro Wed, 11 Oct 2006 17:24:25 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:06 -0700 [PATCH] m32r: C99 initializers in setup.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 399ad77b9098ed2eb27cbfbeb6449c1caab3c18e tree 6282ac7b48efc4354b44eaae3aaac6bbfbe81f8b parent fc048b5b0f2554bc953a8ada5b2e3b82bde2fcb0 author Al Viro Wed, 11 Oct 2006 17:22:34 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:06 -0700 [PATCH] arm-versatile iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fc048b5b0f2554bc953a8ada5b2e3b82bde2fcb0 tree ae7fa5a8e039a72bce77f4d8763f75221f4d4051 parent 35d59fc5d6f318a28a99c5936171afd4edef28c8 author Al Viro Wed, 11 Oct 2006 17:22:54 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:05 -0700 [PATCH] arm: use unsigned long instead of unsigned int in get_user() Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 35d59fc5d6f318a28a99c5936171afd4edef28c8 tree 6a5011dbdfe7222ec694856d93e24348f41cb1f4 parent 5f6e3c836508926e50cebe17ad87f59666a7fb47 author Al Viro Wed, 11 Oct 2006 17:22:44 +0100 committer Linus Torvalds Wed, 11 Oct 2006 11:17:05 -0700 [PATCH] arm __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5f6e3c836508926e50cebe17ad87f59666a7fb47 tree b485fa971b0c17bc16fb81fd5cb8bc5646ce0188 parent 76fd020937f2d09f76a4cd8dbae1f3bec640ff0b author Alexey Dobriyan Wed, 11 Oct 2006 01:22:26 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:26 -0700 [PATCH] md: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Acked-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 76fd020937f2d09f76a4cd8dbae1f3bec640ff0b tree 7e8a001058a7b663e085e85add279642273c6c82 parent bf02c082bf7a464518d45b9c178b8aa83f74dd5d author Jeff Garzik Wed, 11 Oct 2006 01:22:25 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:25 -0700 [PATCH] ISDN: several minor fixes pcbit: kill 'may be used uninitialized' warning. although the code does eventually fill the 32 bits it cares about, the variable truly is accessed uninitialized in each macro. Easier to just clean it up now. sc: fix a ton of obviously incorrect printk's (some with missing arguments even) Signed-off-by: Jeff Garzik Acked-by: Karsten Keil Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bf02c082bf7a464518d45b9c178b8aa83f74dd5d tree 8c0aafa48ec5e2298d76d58baf67bd59a5fa95ae parent 49a6cbe1cd8a72451d9d6ab5b1e163f17c1bbee3 author Andreas Mohr Wed, 11 Oct 2006 01:22:24 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:25 -0700 [PATCH] fs/bio.c: tweaks - Calculate a variable in bvec_alloc_bs() only once needed, not earlier (bio.o down from 18408 to 18376 Bytes, 32 Bytes saved, probably due to data locality improvements). - Init variable idx to silence a gcc warning which already existed in the unmodified original base file (bvec_alloc_bs() handles idx correctly, so there's no need for the warning): fs/bio.c: In function `bio_alloc_bioset': fs/bio.c:169: warning: `idx' may be used uninitialized in this function Signed-off-by: Andreas Mohr Acked-by: Jens Axboe Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 49a6cbe1cd8a72451d9d6ab5b1e163f17c1bbee3 tree 519d69f7daef24f8258c0ca125e1da7344d3a81d parent 69b2186c5fcb335e29c558e3b4e410e1939b5cc8 author Jeff Garzik Wed, 11 Oct 2006 01:22:23 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:25 -0700 [PATCH] drivers/mca: handle sysfs errors Also includes a kmalloc->kzalloc cleanup. Signed-off-by: Jeff Garzik Cc: James Bottomley Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69b2186c5fcb335e29c558e3b4e410e1939b5cc8 tree a7579c6e5c81c74255dacf65eaff383d71ad37eb parent 42ddfd6859b9d57490c94d26e29a43ffd78366e5 author Jeff Garzik Wed, 11 Oct 2006 01:22:23 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:25 -0700 [PATCH] firmware/efivars: handle error Signed-off-by: Jeff Garzik Acked-by: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 42ddfd6859b9d57490c94d26e29a43ffd78366e5 tree cfbdecd4f3af7824861bdb3a5a7fe95554720c19 parent 5e59393ec242d7b772356c95e2be48384cd0c5d7 author Jeff Garzik Wed, 11 Oct 2006 01:22:22 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:25 -0700 [PATCH] EISA: handle sysfs errors Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e59393ec242d7b772356c95e2be48384cd0c5d7 tree b027efc11d5069707d850783f3effb8dd926a721 parent 41bfcfd9ac0fbb59aaaa18e3ed5774e85b716de4 author Jeff Garzik Wed, 11 Oct 2006 01:22:21 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:25 -0700 [PATCH] ipmi: handle sysfs errors Signed-off-by: Jeff Garzik Acked-by: Corey Minyard Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41bfcfd9ac0fbb59aaaa18e3ed5774e85b716de4 tree 5dd2df45aac4c5961070bd89f8a1c26b97c1b649 parent c636ebdb186bf37f98d3839f69293597723edb36 author Jeff Garzik Wed, 11 Oct 2006 01:22:20 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:25 -0700 [PATCH] firmware/dell_rbu: handle sysfs errors Signed-off-by: Jeff Garzik Cc: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c636ebdb186bf37f98d3839f69293597723edb36 tree db1d54d355cd8030bf5d1645ce6bac8842f32690 parent 6ce315234aefcbc599dea390c15672156ebf9e7b author David Howells Wed, 11 Oct 2006 01:22:19 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:25 -0700 [PATCH] VFS: Destroy the dentries contributed by a superblock on unmounting The attached patch destroys all the dentries attached to a superblock in one go by: (1) Destroying the tree rooted at s_root. (2) Destroying every entry in the anon list, one at a time. (3) Each entry in the anon list has its subtree consumed from the leaves inwards. This reduces the amount of work generic_shutdown_super() does, and avoids iterating through the dentry_unused list. Note that locking is almost entirely absent in the shrink_dcache_for_umount*() functions added by this patch. This is because: (1) at the point the filesystem calls generic_shutdown_super(), it is not permitted to further touch the superblock's set of dentries, and nor may it remove aliases from inodes; (2) the dcache memory shrinker now skips dentries that are being unmounted; and (3) the superblock no longer has any external references through which the VFS can reach it. Given these points, the only locking we need to do is when we remove dentries from the unused list and the name hashes, which we do a directory's worth at a time. We also don't need to guard against reference counts going to zero unexpectedly and removing bits of the tree we're working on as nothing else can call dput(). A cut down version of dentry_iput() has been folded into shrink_dcache_for_umount_subtree() function. Apart from not needing to unlock things, it also doesn't need to check for inotify watches. In this version of the patch, the complaint about a dentry still being in use has been expanded from a single BUG_ON() and now gives much more information. Signed-off-by: David Howells Acked-by: NeilBrown Acked-by: Ian Kent Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6ce315234aefcbc599dea390c15672156ebf9e7b tree ecf559a2b3f351dd35e274eb2d78fe6e2902c15c parent edc666e2ff9ec2e4e9510f1127c68c22cffc93f6 author David Howells Wed, 11 Oct 2006 01:22:15 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:25 -0700 [PATCH] AUTOFS: Make sure all dentries refs are released before calling kill_anon_super() Make sure all dentries refs are released before calling kill_anon_super() so that the assumption that generic_shutdown_super() can completely destroy the dentry tree for there will be no external references holds true. What was being done in the put_super() superblock op, is now done in the kill_sb() filesystem op instead, prior to calling kill_anon_super(). This makes the struct autofs_sb_info::root member variable redundant (since sb->s_root is still available), and so that is removed. The calls to shrink_dcache_sb() are also removed since they're also redundant as shrink_dcache_for_umount() will now be called after the cleanup routine. Signed-off-by: David Howells Acked-by: Ian Kent Cc: Trond Myklebust Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit edc666e2ff9ec2e4e9510f1127c68c22cffc93f6 tree 21d139e520a4a7fa79464bbe46e3df145a231d27 parent 9e42ef777f62277ea9bb70976be65bb374e00b9c author David Howells Wed, 11 Oct 2006 01:22:14 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:25 -0700 [PATCH] ReiserFS: Make sure all dentries refs are released before calling kill_block_super() Make sure all dentries refs are released before calling kill_block_super() so that the assumption that generic_shutdown_super() can completely destroy the dentry tree for there will be no external references holds true. What was being done in the put_super() superblock op, is now done in the kill_sb() filesystem op instead, prior to calling kill_block_super(). Changes made in [try #2]: (*) reiserfs_kill_sb() now checks that the superblock FS info pointer is set before trying to dereference it. Signed-off-by: David Howells Cc: "Rafael J. Wysocki" Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9e42ef777f62277ea9bb70976be65bb374e00b9c tree 5cc1a5c7bc4b03ee1795166d9d78f68aec4b1331 parent 272057447f646c51bc77c60044eb21c683fa366d author Andrew Morton Wed, 11 Oct 2006 01:22:13 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:24 -0700 [PATCH] dell_rbu: printk() warning fix drivers/firmware/dell_rbu.c: In function 'packetize_data': drivers/firmware/dell_rbu.c:252: warning: format '%lu' expects type 'long unsigned int', but argument 3 has type 'int' Cc: Matt Domsch Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 272057447f646c51bc77c60044eb21c683fa366d tree 096feb88266ec42ff8a2522699214600b3f6a3fc parent c751c1dbb1289d220a8a175ba0df47706ce95a7e author Randy Dunlap Wed, 11 Oct 2006 01:22:12 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:24 -0700 [PATCH] kernel-doc: make parameter description indentation uniform - In parameter descriptions, strip all whitespace between the parameter name (e.g., @len) and its description so that the description is indented uniformly in text and man page modes. Previously, spaces or tabs (which are used for cleaner source code viewing) affected the produced output in a negative way. Before (man mode): to Destination address, in user space. from Source address, in kernel space. n Number of bytes to copy. After (man mode): to Destination address, in user space. from Source address, in kernel space. n Number of bytes to copy. - Fix/clarify a few function description comments. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c751c1dbb1289d220a8a175ba0df47706ce95a7e tree 91072068ae634924575e01533367039e20e41e63 parent 32e794015aa698fd6bf1ec21b713f900a707fb15 author Mike Frysinger Wed, 11 Oct 2006 01:22:11 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:24 -0700 [PATCH] include linux/types.h in linux/nbd.h The nbd header uses __be32 and such types but doesn't actually include the header that defines these things (linux/types.h); so let's include it. Signed-off-by: Mike Frysinger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 32e794015aa698fd6bf1ec21b713f900a707fb15 tree 3a290d3e6d880792a6f838c68b304eaa963d7226 parent 9c7fff6ef36526fb54694ee8201870f98b6a1747 author Randy Dunlap Wed, 11 Oct 2006 01:22:10 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:24 -0700 [PATCH] kernel-doc: drop various "inline" qualifiers Drop __inline, __always_inline, and noinline in the produced kernel-doc output, similar to other pseudo directives. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9c7fff6ef36526fb54694ee8201870f98b6a1747 tree ed13d3cad8a91098c5aad8d0e0207999d58e9c03 parent 35e38a6e03bedba7c633ae03d286accd85ab6a42 author Randy Dunlap Wed, 11 Oct 2006 01:22:10 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:24 -0700 [PATCH] uaccess.h: match kernel-doc and function names Place kernel-doc function comment header immediately before the function that is being documented. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 35e38a6e03bedba7c633ae03d286accd85ab6a42 tree 7f660cbdd413843bea7a8bd877231e18b932b740 parent 256a6b41365e17cebe5c2fc91ddff716c9aa055a author Randy Dunlap Wed, 11 Oct 2006 01:22:09 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:24 -0700 [PATCH] kernel-doc: fix function name in usercopy.c Fix kernel-doc function name in usercopy.c. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 256a6b41365e17cebe5c2fc91ddff716c9aa055a tree c491008b3e2fefed6a42ac7f824d191e023fb11f parent 5fcce7432a731e67f1cd3ef1e71dca9ea84dedb1 author Ingo Molnar Wed, 11 Oct 2006 01:22:08 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:24 -0700 [PATCH] lockdep: fix printk recursion logic Bug reported and fixed by Tilman Schmidt : if lockdep is enabled then log messages make it to /var/log/messages belatedly. The reason is a missed wakeup of klogd. Initially there was only a lockdep_internal() protection against lockdep recursion within vprintk() - it grew the 'outer' lockdep_off()/on() protection only later on. But that lockdep_off() made the release_console_sem() within vprintk() always happen under the lockdep_internal() condition, causing the bug. The right solution to remove the inner protection against recursion here - the outer one is enough. Signed-off-by: Ingo Molnar Cc: Tilman Schmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5fcce7432a731e67f1cd3ef1e71dca9ea84dedb1 tree 899fb8d0906ea09c142ac650db8672eaf7e38025 parent 3dc3099a9b2c346b16383597fadaa79a05a52388 author Aneesh Kumar Wed, 11 Oct 2006 01:22:07 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:24 -0700 [PATCH] fix lockdep-design.txt I was looking at lockdep-desing.txt and i guess i am confused with the changes with respect to fd7bcea35e7efb108c34ee2b3840942a3749cadb. It says + '.' acquired while irqs enabled + '+' acquired in irq context + '-' acquired in process context with irqs disabled + '?' read-acquired both with irqs enabled and in irq context + But the get_usage_chars() function does this for '-' if (class->usage_mask & LOCKF_ENABLED_HARDIRQS) *c1 = '-'; So i guess what would be correct would be '.' acquired while irqs disabled '+' acquired in irq context '-' acquired with irqs enabled '?' read acquired in irq context with irqs enabled. Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3dc3099a9b2c346b16383597fadaa79a05a52388 tree c2c2a49e135f5e565a4fd3e33aa5c2271d535374 parent 39913b31d0cd11b5b18a303e220c95ffbd9e1a88 author Alexey Dobriyan Wed, 11 Oct 2006 01:22:06 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:24 -0700 [PATCH] lockdep: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39913b31d0cd11b5b18a303e220c95ffbd9e1a88 tree ce9ac4ad5def904c81e846212385d750d2375f89 parent 2ecd05ae68a903761e736e9e0aca40d6ace4319e author Alexey Dobriyan Wed, 11 Oct 2006 01:22:06 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:23 -0700 [PATCH] DAC960: use memmove for overlapping areas Signed-off-by: Alexey Dobriyan Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ecd05ae68a903761e736e9e0aca40d6ace4319e tree 4bb0a178362e954191a6e6cee351745cd2dbe685 parent fbab41ccc479b6b0ba15c137af9e0b1c100bff24 author Alexey Dobriyan Wed, 11 Oct 2006 01:22:05 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:23 -0700 [PATCH] fs/*: use BUILD_BUG_ON Signed-off-by: Alexey Dobriyan Cc: David Woodhouse Cc: David Howells Cc: Mark Fasheh Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fbab41ccc479b6b0ba15c137af9e0b1c100bff24 tree 52b7d856d274a2cab3270a87f3b892b6c9220f1d parent 53bc5b2db16ceefdd972b9ffd1f7bde5c427939e author Adrian Bunk Wed, 11 Oct 2006 01:22:04 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:23 -0700 [PATCH] HT_IRQ must depend on PCI CONFIG_PCI=n, CONFIG_HT_IRQ=y results in the following compile error: ... LD vmlinux arch/i386/mach-generic/built-in.o: In function `apicid_to_node': summit.c:(.text+0x53): undefined reference to `apicid_2_node' arch/i386/kernel/built-in.o: In function `arch_setup_ht_irq': (.text+0xcf79): undefined reference to `write_ht_irq_low' arch/i386/kernel/built-in.o: In function `arch_setup_ht_irq': (.text+0xcf85): undefined reference to `write_ht_irq_high' arch/i386/kernel/built-in.o: In function `k7nops': alternative.c:(.data+0x1358): undefined reference to `mask_ht_irq' alternative.c:(.data+0x1360): undefined reference to `unmask_ht_irq' make[1]: *** [vmlinux] Error 1 Bug report by Jesper Juhl. Signed-off-by: Adrian Bunk Cc: "Eric W. Biederman" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53bc5b2db16ceefdd972b9ffd1f7bde5c427939e tree 07f6e4a9e958ab286a4bd009a8cb055874088458 parent e50190a8341485b413f599033cb74649f849d939 author Aneesh Kumar Wed, 11 Oct 2006 01:22:03 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:23 -0700 [PATCH] Fix typos in mm/shmem_acl.c Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e50190a8341485b413f599033cb74649f849d939 tree c45e165f8167dd95f3b5d4163433b91c8b7afd55 parent 53d5ed627df852ba8bab7f70df25290bd733792c author Matthew Wilcox Wed, 11 Oct 2006 01:22:02 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:23 -0700 [PATCH] Consolidate check_signature There's nothing arch-specific about check_signature(), so move it to . Use a cross between the Alpha and i386 implementations as the generic one. Signed-off-by: Matthew Wilcox Acked-by: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 53d5ed627df852ba8bab7f70df25290bd733792c tree 58bb781ce111451281ed24d858020b49c278d0a5 parent 8c58165108e26d18849a0138c719e680f281197a author Matthew Wilcox Wed, 11 Oct 2006 01:22:01 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:23 -0700 [PATCH] Use linux/io.h instead of asm/io.h In preparation for moving check_signature, change these users from asm/io.h to linux/io.h Signed-off-by: Matthew Wilcox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8c58165108e26d18849a0138c719e680f281197a tree ff5e54e11357867ef3e8edfa9df8de25a688afdc parent 97e860d364aa9d08e895ecb619b9122ae2c70df8 author Monakhov Dmitriy Wed, 11 Oct 2006 01:22:00 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:23 -0700 [PATCH] D-cache aliasing issue in __block_prepare_write A couple of flush_dcache_page()s are missing on the I/O-error paths. Cc: "David S. Miller" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97e860d364aa9d08e895ecb619b9122ae2c70df8 tree eebabd5ead63718b280bc32a03f325a5554bca84 parent 887ed2f3aecde2ff24e06666932dc5f144745044 author Eric Sesterhenn Wed, 11 Oct 2006 01:21:59 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:23 -0700 [PATCH] Remove unnecessary check in fs/fat/inode.c Aince all callers dereference sb, and this function does so earlier too, we dont need the check. Signed-off-by: Eric Sesterhenn Acked-by: OGAWA Hirofumi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 887ed2f3aecde2ff24e06666932dc5f144745044 tree 870280190c3825122dc8e30e7c2be66465b9f9f2 parent cd0810410beb86c570aeb3dcd3dc1fc5ab9e6077 author Trond Myklebust Wed, 11 Oct 2006 01:21:58 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:22 -0700 [PATCH] VM: Fix the gfp_mask in invalidate_complete_page2 If try_to_release_page() is called with a zero gfp mask, then the filesystem is effectively denied the possibility of sleeping while attempting to release the page. There doesn't appear to be any valid reason why this should be banned, given that we're not calling this from a memory allocation context. For this reason, change the gfp_mask argument of the call to GFP_KERNEL. Signed-off-by: Trond Myklebust Cc: Steve Dickson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cd0810410beb86c570aeb3dcd3dc1fc5ab9e6077 tree 4a2dcbf9b0e66a9aef69a94bf0d6ce8c7fe1fee8 parent 01a3ee2b203e511e20f98b85a9172fd32c53e87c author Matthias Urlichs Wed, 11 Oct 2006 01:21:57 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:22 -0700 [PATCH] document the core-dump-to-a-pipe patch The pipe-a-coredump-to-a-program feature was undocumented. *Grumble*. NB: a good enhancement to that patch would be: save all the stuff that a core file can get from the %x expansions in the environment. Signed-off-by: Matthias Urlichs Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 01a3ee2b203e511e20f98b85a9172fd32c53e87c tree 0dd90d81dc86f231828af23bdb97522405b06cab parent 39484e53bb00f55b6303a908070db133608ef2a5 author Reinette Chatre Wed, 11 Oct 2006 01:21:55 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:22 -0700 [PATCH] bitmap: parse input from kernel and user buffers lib/bitmap.c:bitmap_parse() is a library function that received as input a user buffer. This seemed to have originated from the way the write_proc function of the /proc filesystem operates. This has been reworked to not use kmalloc and eliminates a lot of get_user() overhead by performing one access_ok before using __get_user(). We need to test if we are in kernel or user space (is_user) and access the buffer differently. We cannot use __get_user() to access kernel addresses in all cases, for example in architectures with separate address space for kernel and user. This function will be useful for other uses as well; for example, taking input for /sysfs instead of /proc, so it was changed to accept kernel buffers. We have this use for the Linux UWB project, as part as the upcoming bandwidth allocator code. Only a few routines used this function and they were changed too. Signed-off-by: Reinette Chatre Signed-off-by: Inaky Perez-Gonzalez Cc: Paul Jackson Cc: Joe Korty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 39484e53bb00f55b6303a908070db133608ef2a5 tree 26c561e6ba06d03973652cc37544a7d930e18e42 parent 2e3ad8af43c2f555c1be6c02581f6cc939dcb71c author Maciej W. Rozycki Wed, 11 Oct 2006 01:21:54 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:22 -0700 [PATCH] 32-bit compatibility HDIO IOCTLs A couple of HDIO IOCTLs are not yet handled and a few others are marked as using a pointer rather than an unsigned long. The formers include: HDIO_GET_WCACHE, HDIO_GET_ACOUSTIC, HDIO_GET_ADDRESS and HDIO_GET_BUSSTATE. The latters are: HDIO_SET_MULTCOUNT, HDIO_SET_UNMASKINTR, HDIO_SET_KEEPSETTINGS, HDIO_SET_32BIT, HDIO_SET_NOWERR, HDIO_SET_DMA, HDIO_SET_PIO_MODE and HDIO_SET_NICE. Additionally 0x330 used to be HDIO_GETGEO_BIG and may be issued by 32-bit `hdparm' run on a 64-bit kernel making Linux complain loudly. This is a fix for these issues. Signed-off-by: Maciej W. Rozycki Cc: Alan Cox Acked-by: Arnd Bergmann Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2e3ad8af43c2f555c1be6c02581f6cc939dcb71c tree a45747a7a10cc336dca9e475a4d6254fbfe9e7da parent 8258d4a574d3a8c01f0ef68aa26b969398a0e140 author Jeff Garzik Wed, 11 Oct 2006 01:21:53 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:22 -0700 [PATCH] x86/microcode: handle sysfs error Signed-off-by: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8258d4a574d3a8c01f0ef68aa26b969398a0e140 tree b3b3e062f340f0bbddd166358a7adebe6099574a parent beed33a816204cb402c69266475b6a60a2433ceb author Andrew Morton Wed, 11 Oct 2006 01:21:53 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:22 -0700 [PATCH] invalidate_inode_pages2_range() debug A failure in invalidate_inode_pages2_range() can result in unpleasant things happening in NFS (at least). Stick a WARN_ON_ONCE() in there so we can find out if it happens, and maybe why. (akpm: might be a -mm-only patch, we'll see..) Cc: Chuck Lever Cc: Trond Myklebust Cc: Steve Dickson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit beed33a816204cb402c69266475b6a60a2433ceb tree 4eaa7e5a1ccf2960d1478774cdfcab671384accb parent f33d9bd50478c9a969b65f58feb6b69a3ad478cb author Nick Piggin Wed, 11 Oct 2006 01:21:52 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:22 -0700 [PATCH] sched: likely profiling This likely profiling is pretty fun. I found a few possible problems in sched.c. This patch may be not measurable, but when I did measure long ago, nooping (un)likely cost a couple of % on scheduler heavy benchmarks, so it all adds up. Tweak some branch hints: - the 2nd 64 bits in the bitmask is likely to be populated, because it contains the first 28 bits (nearly 3/4) of the normal priorities. (ratio of 669669:691 ~= 1000:1). - it isn't unlikely that context switching switches to another process. it might be very rapidly switching to and from the idle process (ratio of 475815:419004 and 471330:423544). Let the branch predictor decide. - preempt_enable seems to be very often called in a nested preempt_disable or with interrupts disabled (ratio of 3567760:87965 ~= 40:1) Signed-off-by: Nick Piggin Acked-by: Ingo Molnar Cc: Daniel Walker Cc: Hua Zhong Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f33d9bd50478c9a969b65f58feb6b69a3ad478cb tree 90f7455da171aa2b7558d5921f199015b5ab9a0b parent 5a2b4062f5adf2218b9b021e1c33f374bf142cb2 author Jeff Garzik Wed, 11 Oct 2006 01:21:51 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:22 -0700 [PATCH] tpm: fix error handling - handle sysfs error - handle driver model errors - de-obfuscate platform_device_register_simple() call, which included an assignment in between two function calls, in the same C statement. Signed-off-by: Jeff Garzik Acked-by: Kylene Hall Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5a2b4062f5adf2218b9b021e1c33f374bf142cb2 tree bbcfec5a14d55423a5632963cdfcf2b689be5222 parent 2245d7c21f5bb1f104ee1226ebcb3dd5b9acfff6 author Vasily Averin Wed, 11 Oct 2006 01:21:50 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:21 -0700 [PATCH] ext2: errors behaviour fix Current error behaviour for ext2 and ext3 filesystems does not fully correspond to the documentation and should be fixed. According to man 8 mount, ext2 and ext3 file systems allow to set one of 3 different on-errors behaviours: ---- start of quote man 8 mount ---- errors=continue / errors=remount-ro / errors=panic Define the behaviour when an error is encountered. (Either ignore errors and just mark the file system erroneous and continue, or remount the file system read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using tune2fs(8). ---- end of quote ---- However EXT3_ERRORS_CONTINUE is not read from the superblock, and thus ERRORS_CONT is not saved on the sbi->s_mount_opt. It leads to the incorrect handle of errors on ext3. Then we've checked corresponding code in ext2 and discovered that it is buggy as well: - EXT2_ERRORS_CONTINUE is not read from the superblock (the same); - parse_option() does not clean the alternative values and thus something like (ERRORS_CONT|ERRORS_RO) can be set; - if options are omitted, parse_option() does not set any of these options. Therefore it is possible to set any combination of these options on the ext2: - none of them may be set: EXT2_ERRORS_CONTINUE on superblock / empty mount options; - any of them may be set using mount options; - 2 any options may be set: by using EXT2_ERRORS_RO/EXT2_ERRORS_PANIC on the superblock and other value in mount options; - and finally all three options may be set by adding third option in remount. Currently ext2 uses these values only in ext2_error() and it is not leading to any noticeable troubles. However somebody may be discouraged when he will try to workaround EXT2_ERRORS_PANIC on the superblock by using errors=continue in mount options. This patch: EXT2_ERRORS_CONTINUE should be read from the superblock as default value for error behaviour. parse_option() should clean the alternative options and should not change default value taken from the superblock. Signed-off-by: Vasily Averin Acked-by: Kirill Korotaev Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2245d7c21f5bb1f104ee1226ebcb3dd5b9acfff6 tree 61b4bcf44994399fe5d23016be5c6e52f9569226 parent fa3ba2e81ea23416272a22009bba95954c81969c author Dmitry Mishin Wed, 11 Oct 2006 01:21:49 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:21 -0700 [PATCH] ext3: errors behaviour fix Current error behaviour for ext2 and ext3 filesystems does not fully correspond to the documentation and should be fixed. According to man 8 mount, ext2 and ext3 file systems allow to set one of 3 different on-errors behaviours: ---- start of quote man 8 mount ---- errors=continue / errors=remount-ro / errors=panic Define the behaviour when an error is encountered. (Either ignore errors and just mark the file system erroneous and continue, or remount the file system read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using tune2fs(8). ---- end of quote ---- However EXT3_ERRORS_CONTINUE is not read from the superblock, and thus ERRORS_CONT is not saved on the sbi->s_mount_opt. It leads to the incorrect handle of errors on ext3. Then we've checked corresponding code in ext2 and discovered that it is buggy as well: - EXT2_ERRORS_CONTINUE is not read from the superblock (the same); - parse_option() does not clean the alternative values and thus something like (ERRORS_CONT|ERRORS_RO) can be set; - if options are omitted, parse_option() does not set any of these options. Therefore it is possible to set any combination of these options on the ext2: - none of them may be set: EXT2_ERRORS_CONTINUE on superblock / empty mount options; - any of them may be set using mount options; - 2 any options may be set: by using EXT2_ERRORS_RO/EXT2_ERRORS_PANIC on the superblock and other value in mount options; - and finally all three options may be set by adding third option in remount. Currently ext2 uses these values only in ext2_error() and it is not leading to any noticeable troubles. However somebody may be discouraged when he will try to workaround EXT2_ERRORS_PANIC on the superblock by using errors=continue in mount options. This patch: EXT3_ERRORS_CONTINUE should be taken from the superblock as default value for error behaviour. Signed-off-by: Dmitry Mishin Acked-by: Vasily Averin Acked-by: Kirill Korotaev Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fa3ba2e81ea23416272a22009bba95954c81969c tree cd1ab15dcf1130a4920ca9396cb91aaff4b0dcf6 parent 3719bc5c22c9025bf1c909fe8b527ebf1de9a153 author Florin Malita Wed, 11 Oct 2006 01:21:48 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:21 -0700 [PATCH] fix Module taint flags listing in Oops/panic Module taint flags listing in Oops/panic has a couple of issues: * taint_flags() doesn't null-terminate the buffer after printing the flags * per-module taints are only set if the kernel is not already tainted (with that particular flag) => only the first offending module gets its taint info correctly updated Some additional changes: * 'license_gplok' is no longer needed - equivalent to !(taints & TAINT_PROPRIETARY_MODULE) - so we can drop it from struct module * exporting module taint info via /proc/module: pwc 88576 0 - Live 0xf8c32000 evilmod 6784 1 pwc, Live 0xf8bbf000 (PF) Signed-off-by: Florin Malita Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3719bc5c22c9025bf1c909fe8b527ebf1de9a153 tree c8903738ba172c57c007292e72b0a5c671fe0e1a parent e5657933863f43cc6bb76a54d659303dafaa9e58 author Alan Cox Wed, 11 Oct 2006 01:21:47 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:21 -0700 [PATCH] ide-generic: jmicron fix Some people find their Jmicron pata port reports its disabled even though it has devices on it and was boot probed. Fix this (Candidate for 2.6.18.*, less so for 2.6.19 as we've got a proper jmicron driver on the merge for that to replace ide-generic support) Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e5657933863f43cc6bb76a54d659303dafaa9e58 tree 7f6351194953b0d167ea79749d9fcaf9ae7f6a1f parent e0ab2928cc2202f13f0574d4c6f567f166d307eb author Andrew Morton Wed, 11 Oct 2006 01:21:46 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:21 -0700 [PATCH] grow_buffers() infinite loop fix If grow_buffers() is for some reason passed a block number which wants to lie outside the maximum-addressable pagecache range (PAGE_SIZE * 4G bytes) then it will accidentally truncate `index' and will then instnatiate a page at the wrong pagecache offset. This causes __getblk_slow() to go into an infinite loop. This can happen with corrupted disks, or with software errors elsewhere. Detect that, and handle it. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e0ab2928cc2202f13f0574d4c6f567f166d307eb tree 3df0b8e340b1a98cd8a2daa19672ff008e8fb7f9 parent b611967de4dc5c52049676c4369dcac622a7cdfe author Stephane Eranian Wed, 11 Oct 2006 01:21:45 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:21 -0700 [PATCH] Add carta_random32() library routine This is a follow-up patch based on the review for perfmon2. This patch adds the carta_random32() library routine + carta_random32.h header file. This is fast, simple, and efficient pseudo number generator algorithm. We use it in perfmon2 to randomize the sampling periods. In this context, we do not need any fancy randomizer. Signed-off-by: stephane eranian Cc: David Mosberger Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b611967de4dc5c52049676c4369dcac622a7cdfe tree 8c19038c8bbaa4851dcb99bed33707deaf5170d1 parent 0f836e5fecf59d0d0353e9af11fd14a32a3001ae author Davide Libenzi Wed, 11 Oct 2006 01:21:44 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:21 -0700 [PATCH] epoll_pwait() Implement the epoll_pwait system call, that extend the event wait mechanism with the same logic ppoll and pselect do. The definition of epoll_pwait is: int epoll_pwait(int epfd, struct epoll_event *events, int maxevents, int timeout, const sigset_t *sigmask, size_t sigsetsize); The difference between the vanilla epoll_wait and epoll_pwait is that the latter allows the caller to specify a signal mask to be set while waiting for events. Hence epoll_pwait will wait until either one monitored event, or an unmasked signal happen. If sigmask is NULL, the epoll_pwait system call will act exactly like epoll_wait. For the POSIX definition of pselect, information is available here: http://www.opengroup.org/onlinepubs/009695399/functions/select.html Signed-off-by: Davide Libenzi Cc: David Woodhouse Cc: Andi Kleen Cc: Michael Kerrisk Cc: Ulrich Drepper Cc: Roland McGrath Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0f836e5fecf59d0d0353e9af11fd14a32a3001ae tree b5ac08451e0a7e0aa1f4c8782fed88cf2f909811 parent c21be1c9c1ab42fe285a74f184e1acbc37ee084b author David Woodhouse Wed, 11 Oct 2006 01:21:43 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:21 -0700 [PATCH] Add CONFIG_HEADERS_CHECK option to automatically run 'make headers_check' In order to encourage people to notice when they break the exported headers, add a config option which automatically runs the sanity checks when building vmlinux. That way, those who use allyesconfig will notice failures. Signed-off-by: David Woodhouse Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c21be1c9c1ab42fe285a74f184e1acbc37ee084b tree d9f7b20e39ed9cd0fa1cbb3694bbc21be8e3b5de parent ca316fcf641532ee70dfc59daf632d1685b7d902 author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:42 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:21 -0700 [PATCH] uml: allow finer tuning for host VMSPLIT setting Now that various memory splits are enabled, add a config option allowing the user to compile UML for its need - HOST_2G_2G allowed to choose either 3G/1G or 2G/2G, and enabling it reduced the usable virtual memory. Detecting this at run time should be implemented in the future, but we must make the stop-gap measure work well enough (this is valid in _many_ cases). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ca316fcf641532ee70dfc59daf632d1685b7d902 tree de5fde0b7889943700fbe6c9a6b143362f4bc034 parent f2d57151bd3110ae3f0db3e5770ab1a46d1b647a author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:41 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:21 -0700 [PATCH] uml: deprecate CONFIG_MODE_TT Deprecate TT mode in Kconfig so that users won't select it, update the MODE_SKAS description (it was largely obsolete and misleadin) and btw describe advantages for high memory usage with CONFIG_STATIC_LINK. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f2d57151bd3110ae3f0db3e5770ab1a46d1b647a tree 8a355103aa134873d81c7c03ffaa27ba35113780 parent d27ecef7c63064c1f2eadf413e694e65a34f1f79 author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:40 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:20 -0700 [PATCH] uml: remove duplicate export The export is together with the definition, in arch/x86_64/lib/csum-partial.c, which is compiled in by arch/um/sys-x86_64/Makefile. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d27ecef7c63064c1f2eadf413e694e65a34f1f79 tree dcd7baf37664a24e7631df3f22fb44d744c7ff09 parent 2465b8580a5649ee789f213d39c1b49d84fefe8f author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:40 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:20 -0700 [PATCH] uml: asm offsets duplication removal Unify macros common to x86 and x86_64 kernel-offsets.h files. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2465b8580a5649ee789f213d39c1b49d84fefe8f tree 2238f768c1f250babf5d8875080ac34cbe70ad8d parent 711553efa5b8581365084cacf3585a36ca253bab author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:38 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:20 -0700 [PATCH] uml: allow using again x86/x86_64 crypto code Enable compilation of x86_64 crypto code;, and add the needed constant to make the code compile again (that macro was added to i386 asm-offsets between 2.6.17 and 2.6.18, in 6c2bb98bc33ae33c7a33a133a4cd5a06395fece5). Cc: Herbert Xu Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 711553efa5b8581365084cacf3585a36ca253bab tree 3ff10e6e99de3f2584cd57452327ee1621f456a0 parent 69fada32d868d7f4be128ea4df8fbe4fd897fc34 author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:37 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:20 -0700 [PATCH] uml: declare in Kconfig our partial LOCKDEP support Declare UML partial support for LOCKDEP - however IRQFLAGS tracing requires some coding which nobody did yet, so we cannot run full lockdep on UML. Grep for CONFIG_TRACE_IRQFLAGS on i386 code to find their implementation. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 69fada32d868d7f4be128ea4df8fbe4fd897fc34 tree ab216b52da48f39a418b1f67671c3fb05fce33df parent 1b4ad242fcfcf1e261604cb91ee5fb8032900997 author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:36 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:20 -0700 [PATCH] uml: fix uname under setarch i386 On a 64bit Uml, if run under "setarch i386" (which a user did), uname() currently returns the obtained i686 as machine - fix that. Btw, I'm quite surprised that under setarch i386 a 64-bit binary can run. Cc: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1b4ad242fcfcf1e261604cb91ee5fb8032900997 tree 84ffb5ef172dc4142b132dc84e6585d26353fa07 parent b5cdb5797d364a112879e49cc708083853ffc592 author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:35 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:20 -0700 [PATCH] uml: fix processor selection to exclude unsupported processors and features Makes UML compile on any possible processor choice. The two problems were: *) x86 code, when 386 is selected, checks at runtime boot_cpuflags, which we do not have. *) 3Dnow support for memcpy() et al. does not compile currently and fixing this is not trivial, so simply disable it; with this change, if one selects MK7 UML compiles (while it did not). Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b5cdb5797d364a112879e49cc708083853ffc592 tree fa87aa6b3a0511ffe7f7c76f52e3e0d037833bb0 parent d875f9fd3f2369bf6f4d0e9989f00fe610eac470 author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:34 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:20 -0700 [PATCH] uml: make UML_SETJMP always safe If enable is moved by GCC in a register its value may not be preserved after coming back there with longjmp(). So, mark it as volatile to prevent this; this is suggested (it seems) in info gcc, when it talks about -Wuninitialized. I re-read this and it seems to say something different, but I still believe this may be needed. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d875f9fd3f2369bf6f4d0e9989f00fe610eac470 tree 6a75e68d2fe1f4429237be689d9889cde2974501 parent e27e80b3da7ad6b90185bd689879888907104a40 author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:34 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:20 -0700 [PATCH] uml: make TT mode compile after setjmp-related changes Make TT mode compile after the introduction of klibc's implementation of setjmp. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit e27e80b3da7ad6b90185bd689879888907104a40 tree 112c6621f3b2db0737737efc3ca8ad22ce3875ac parent 21c935e5298a3bc4f16cdff7ce3b1efab92b995e author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:33 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:20 -0700 [PATCH] uml: readd forgot prototype This was forgot in a previous patch so UML does not compile with TT mode enabled. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 21c935e5298a3bc4f16cdff7ce3b1efab92b995e tree 63f337847f0ac7037ab157c1858626ae7ba7ca5b parent 1875a48fed4239769bacb039175a52e42b0ebd71 author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:32 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:20 -0700 [PATCH] uml: correct removal of pte_mkexec Correct commit 5906e4171ad61ce68de95e51b773146707671f80 - this makes more sense: we turn pte_mkexec + pte_wrprotect to pte_mkread. However, due to a bug in pte_mkread, it does the exact same thing as pte_mkwrite, so this patch improves the code but does not change anything in practice. The pte_mkread bug is fixed separately, as it may have big impact. Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1875a48fed4239769bacb039175a52e42b0ebd71 tree c2f77d6ba2f9be0c459e7dd75dc701ca63356ad9 parent 9858db504caedb2424b9a32744c23f9a81ec1731 author Paolo 'Blaisorblade' Giarrusso Wed, 11 Oct 2006 01:21:31 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:19 -0700 [PATCH] uml: revert wrong patch Andi Kleen pointed out that -mcmodel=kernel does not make sense for userspace code and would stop everything from working, and pointed out the correct fix for the original bug (not easy to do for me). Reverts part of commit 06837504de7b4883e92af207dbbab4310d0db0ed. Cc: Andi Kleen Signed-off-by: Paolo 'Blaisorblade' Giarrusso Cc: Jeff Dike Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9858db504caedb2424b9a32744c23f9a81ec1731 tree 516b4735df82feb9b14bea4984769e7ac013373d parent dafb13673c463bc2aade4a4819704dde0f5fa37f author Nick Piggin Wed, 11 Oct 2006 01:21:30 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:19 -0700 [PATCH] mm: locks_freed fix Move the lock debug checks below the page reserved checks. Also, having debug_check_no_locks_freed in kernel_map_pages is wrong. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dafb13673c463bc2aade4a4819704dde0f5fa37f tree 4944daaa4ca8e9d988e4357ae902fda6ea531d28 parent 699397499742d1245ea5d677a08fa265df666d2d author Nick Piggin Wed, 11 Oct 2006 01:21:30 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:19 -0700 [PATCH] mm: arch_free_page fix After the PG_reserved check was added, arch_free_page was being called in the wrong place (it could be called for a page we don't actually want to free). Fix that. Signed-off-by: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 699397499742d1245ea5d677a08fa265df666d2d tree 81e9971ff13fcadb6ea8ab12f55278c30bdff1a2 parent b16bc64d1aed40fb9cff9187061005b2a89b5d5d author Keith Owens Wed, 11 Oct 2006 01:21:28 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:19 -0700 [PATCH] Fix do_mbind warning with CONFIG_MIGRATION=n With CONFIG_MIGRATION=n mm/mempolicy.c: In function 'do_mbind': mm/mempolicy.c:796: warning: passing argument 2 of 'migrate_pages' from incompatible pointer type Signed-off-by: Keith Owens Cc: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b16bc64d1aed40fb9cff9187061005b2a89b5d5d tree f6892377e9be2dcf1270f1158a1c325052b3b5c9 parent 469340236a7c9673df3e6a2425f559517f01464e author Dave Jones Wed, 11 Oct 2006 01:21:27 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:19 -0700 [PATCH] move rmap BUG_ON outside DEBUG_VM We have a persistent dribble of reports of this BUG triggering. Its extended diagnostics were recently made conditional on CONFIG_DEBUG_VM, which was a bad idea - we want to know about it. Signed-off-by: Dave Jones Cc: Nick Piggin Cc: Hugh Dickins Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 469340236a7c9673df3e6a2425f559517f01464e tree 83453754d7e3ac5d9d16fbd19374c66899938afe parent fc513a333b45f8913d40c8241a0cb61be79e1c60 author Christoph Lameter Wed, 11 Oct 2006 01:21:26 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:19 -0700 [PATCH] mm: kevent threads: use MPOL_DEFAULT Switch the memory policy of the kevent threads to MPOL_DEFAULT while leaving the kzalloc of the workqueue structure on interleave. This means that all code executed in the context of the kevent thread is allocating node local. Signed-off-by: Christoph Lameter Cc: Christoph Lameter Cc: Alok Kataria Cc: Andi Kleen Cc: Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fc513a333b45f8913d40c8241a0cb61be79e1c60 tree 1abd23dd907da0ca29ff0511aeda238efbaa8662 parent 63f5793351d821749979e36889f9c089c6028c83 author Dave Kleikamp Wed, 11 Oct 2006 01:21:25 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:19 -0700 [PATCH] Documentation/filesystems/ext4.txt This file, ext4.txt, was put together with information from Andrew Morton, Andreas Dilger, Suparna Bhattacharya, and Ted Ts'o. I copied the mount options, with the exception of "extents", from ext3.txt, so if anyone is aware of anything out-of-date, please let me know. Signed-off-by: Dave Kleikamp Cc: Theodore Ts'o Cc: Suparna Bhattacharya Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 63f5793351d821749979e36889f9c089c6028c83 tree 654a9e600891ccf0c70c0bbbc0a15a52743ff90e parent ceea16bf85fb46035dda1db263ca29b0e07e22ba author Andrew Morton Wed, 11 Oct 2006 01:21:24 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:19 -0700 [PATCH] ext4 whitespace cleanups Someone's tab key is emitting spaces. Attempt to repair some of the damage. Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ceea16bf85fb46035dda1db263ca29b0e07e22ba tree da3006995b5d4c58eca2e7e03633e0e93f632374 parent 70bbb3e0a07c1ff2dd383761b12f865b6002a7a0 author Dmitry Mishin Wed, 11 Oct 2006 01:21:21 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:19 -0700 [PATCH] ext4: errors behaviour fix Current error behaviour for ext2 and ext3 filesystems does not fully correspond to the documentation and should be fixed. According to man 8 mount, ext2 and ext3 file systems allow to set one of 3 different on-errors behaviours: ---- start of quote man 8 mount ---- errors=continue / errors=remount-ro / errors=panic Define the behaviour when an error is encountered. (Either ignore errors and just mark the file system erroneous and continue, or remount the file system read-only, or panic and halt the system.) The default is set in the filesystem superblock, and can be changed using tune2fs(8). ---- end of quote ---- However EXT3_ERRORS_CONTINUE is not read from the superblock, and thus ERRORS_CONT is not saved on the sbi->s_mount_opt. It leads to the incorrect handle of errors on ext3. Then we've checked corresponding code in ext2 and discovered that it is buggy as well: - EXT2_ERRORS_CONTINUE is not read from the superblock (the same); - parse_option() does not clean the alternative values and thus something like (ERRORS_CONT|ERRORS_RO) can be set; - if options are omitted, parse_option() does not set any of these options. Therefore it is possible to set any combination of these options on the ext2: - none of them may be set: EXT2_ERRORS_CONTINUE on superblock / empty mount options; - any of them may be set using mount options; - 2 any options may be set: by using EXT2_ERRORS_RO/EXT2_ERRORS_PANIC on the superblock and other value in mount options; - and finally all three options may be set by adding third option in remount. Currently ext2 uses these values only in ext2_error() and it is not leading to any noticeable troubles. However somebody may be discouraged when he will try to workaround EXT2_ERRORS_PANIC on the superblock by using errors=continue in mount options. This patch: EXT4_ERRORS_CONTINUE should be taken from the superblock as default value for error behaviour. Signed-off-by: Dmitry Mishin Acked-by: Vasily Averin Acked-by: Kirill Korotaev Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 70bbb3e0a07c1ff2dd383761b12f865b6002a7a0 tree b85a2c9eed08ce38fe085bbc76b569854f0b0396 parent f4e5bc244f23ee024a4dfa034b591b219b2bfb8f author Andrew Morton Wed, 11 Oct 2006 01:21:20 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:18 -0700 [PATCH] ext4: rename logic_sb_block I assume this means "logical sb block". So call it that. I still don't understand the name though. A block is a block. What's different about this one? Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f4e5bc244f23ee024a4dfa034b591b219b2bfb8f tree df0cb1469de20ae9706a671ab8e9b049e1d93f63 parent 72b64b594081ef0a0717f6aad77e891c72ed4afa author Andrew Morton Wed, 11 Oct 2006 01:21:19 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:18 -0700 [PATCH] ext4 64 bit divide fix With CONFIG_LBD=n, sector_div() expands to a plain old divide. But ext4 is _not_ passing in a sector_t as the first argument, so... fs/built-in.o: In function `ext4_get_group_no_and_offset': fs/ext4/balloc.c:39: undefined reference to `__umoddi3' fs/ext4/balloc.c:41: undefined reference to `__udivdi3' fs/built-in.o: In function `find_group_orlov': fs/ext4/ialloc.c:278: undefined reference to `__udivdi3' fs/built-in.o: In function `ext4_fill_super': fs/ext4/super.c:1488: undefined reference to `__udivdi3' fs/ext4/super.c:1488: undefined reference to `__umoddi3' fs/ext4/super.c:1594: undefined reference to `__udivdi3' fs/ext4/super.c:1601: undefined reference to `__umoddi3' Fix that up by calling do_div() directly. Also cast the arg to u64. do_div() is only defined on u64, and ext4_fsblk_t is supposed to be opaque. Note especially the changes to find_group_orlov(). It was attempting to do do_div(int, unsigned long long); which is royally screwed up. Switched it to plain old divide. Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 72b64b594081ef0a0717f6aad77e891c72ed4afa tree 50fdb2b2743a95066ee83f58bed9c44daf707506 parent 8fadc14323684c547f74cf2f4d13517c6c264731 author Andrew Morton Wed, 11 Oct 2006 01:21:18 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:18 -0700 [PATCH] ext4 uninline ext4_get_group_no_and_offset() Way too big to inline. Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 8fadc14323684c547f74cf2f4d13517c6c264731 tree 2b3eedf241a0d7c86f6b808f76e267ded28506ed parent 0d1ee42f27d30eed1659f3e85bcbbc7b3711f61f author Alexandre Ratchov Wed, 11 Oct 2006 01:21:15 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:18 -0700 [PATCH] ext4: move block number hi bits move '_hi' bits of block numbers in the larger part of the block group descriptor structure Signed-off-by: Alexandre Ratchov Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 0d1ee42f27d30eed1659f3e85bcbbc7b3711f61f tree 9477b1b1813e67e9a0a06af13c91a34c23c42bc8 parent 18eba7aae080d4a5c0d850ea810e83d11f0a8d77 author Alexandre Ratchov Wed, 11 Oct 2006 01:21:14 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:18 -0700 [PATCH] ext4: allow larger descriptor size make block group descriptor larger. Signed-off-by: Alexandre Ratchov Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 18eba7aae080d4a5c0d850ea810e83d11f0a8d77 tree 58277e871787fad73c588b3ba81899f9c8b98553 parent 9b8f1f0106ab39ad58765d4e7c57189835f51127 author Mingming Cao Wed, 11 Oct 2006 01:21:13 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:18 -0700 [PATCH] jbd2: switch blks_type from sector_t to ull Similar to ext4, change blocks in JBD2 from sector_t to unsigned long long. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9b8f1f0106ab39ad58765d4e7c57189835f51127 tree 7f853ec30e4edc57f8b0c82db52b20a5beb75c38 parent 2ae0210760aed9d626eaede5b63db95e198f7c8e author Mingming Cao Wed, 11 Oct 2006 01:21:13 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:18 -0700 [PATCH] ext4: removesector_t bits check Previously when in-kernel ext4 block type is sector_t, it's only 4 bits long under some 32bit arch (when CONFIG_LBD is not on). So we need to check the size of sector_t before we read 48bit long on-disk blocks to in-kernel blocks. These checks are unnecessary now as we changed the in-kernel blocks to unsigned longlong. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 2ae0210760aed9d626eaede5b63db95e198f7c8e tree 40fd1795f7d2b337407876d515a0147d72cea4f4 parent bd81d8eec043094d3ff729a8ff6d5b3a06d3c4b1 author Mingming Cao Wed, 11 Oct 2006 01:21:11 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:18 -0700 [PATCH] ext4: blk_type from sector_t to unsigned long long Change ext4 in-kernel block type (ext4_fsblk_t) from sector_t to unsigned long long. Remove ext4 block type string micro E3FSBLK, replaced with "%llu" [akpm@osdl.org: build fix] Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit bd81d8eec043094d3ff729a8ff6d5b3a06d3c4b1 tree 6813a81b8d8453536839d8bcdc8ed924fdab3f44 parent a1ddeb7eaecea6a924e3a79aa386797020cb436f author Laurent Vivier Wed, 11 Oct 2006 01:21:10 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:17 -0700 [PATCH] ext4: 64bit metadata In-kernel super block changes to support >32 bit free blocks numbers. Signed-off-by: Laurent Vivier Signed-off-by: Dave Kleikamp Signed-off-by: Alexandre Ratchov Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a1ddeb7eaecea6a924e3a79aa386797020cb436f tree aa044e5447394097b9a6e8d1222988ba50d3b8b5 parent 299717696d48531d70aeb4614c3939e4a28456c1 author Badari Pulavarty Wed, 11 Oct 2006 01:21:09 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:17 -0700 [PATCH] ext4: 48bit i_file_acl As we are planning to support 48-bit block numbers for ext4, we need to support 48-bit block numbers for extended attributes. In the short term, we can do this by reuse (on-disk) 16-bit padding (linux2.i_pad1 currently used only by "hurd") as high order bits for xattr. This patch basically does that. Signed-off-by: Badari Pulavarty Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 299717696d48531d70aeb4614c3939e4a28456c1 tree d63c05b0192e480917c48126b2ac7c0f74d08018 parent b517bea1c74e4773482b3f41b3f493522a8c8e30 author Mingming Cao Wed, 11 Oct 2006 01:21:09 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:17 -0700 [PATCH] jbd2: sector_t conversion JBD layer in-kernel block varibles type fixes to support >32 bit block number and convert to sector_t type. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b517bea1c74e4773482b3f41b3f493522a8c8e30 tree 1e98110151f1a35cde84ce1a2cb6f0cb871e9551 parent d0d856e8bd6e697cb44b2b4dd038f3bec576a70e author Zach Brown Wed, 11 Oct 2006 01:21:08 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:16 -0700 [PATCH] 64-bit jbd2 core Here is the patch to JBD to handle 64 bit block numbers, originally from Zach Brown. This patch is useful only after adding support for 64-bit block numbers in the filesystem. Signed-off-by: Badari Pulavarty Signed-off-by: Zach Brown Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d0d856e8bd6e697cb44b2b4dd038f3bec576a70e tree c069f410d607e40faf30107efe719dc2d068283b parent 471d4011a9862efff02094388b8fe8cd67683c38 author Randy Dunlap Wed, 11 Oct 2006 01:21:07 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:16 -0700 [PATCH] ext4: clean up comments in ext4-extents patch Signed-off-by: Randy Dunlap Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 471d4011a9862efff02094388b8fe8cd67683c38 tree 7ec2cdd632cf4076517d3c81044643ac65528b9b parent f65e6fba163dfd0f962efb7d8f5528b6872e2b15 author Suparna Bhattacharya Wed, 11 Oct 2006 01:21:06 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:16 -0700 [PATCH] ext4: uninitialised extent handling Make it possible to add file preallocation support in future as an RO_COMPAT feature by recognizing uninitialized extents as holes and limiting extent length to keep the top bit of ee_len free for marking uninitialized extents. Signed-off-by: Suparna Bhattacharya Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f65e6fba163dfd0f962efb7d8f5528b6872e2b15 tree 75ee824ba0e97038754f0732c458c689c04a4182 parent 3a5b2ecdd1fa63a8f25bd769223bc1c2564ce45d author Alex Tomas Wed, 11 Oct 2006 01:21:05 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:16 -0700 [PATCH] ext4: 48bit physical block number support in extents Signed-off-by: Alex Tomas Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3a5b2ecdd1fa63a8f25bd769223bc1c2564ce45d tree dc80fdde9ed01e77ef0ed6fdef7573d303bd07db parent a86c61812637c7dd0c57e29880cffd477b62f2e7 author Mingming Cao Wed, 11 Oct 2006 01:21:05 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:16 -0700 [PATCH] ext4: switch fsblk to sector_t Redefine ext3 in-kernel filesystem block type (ext3_fsblk_t) from unsigned long to sector_t, to allow kernel to handle >32 bit ext3 blocks. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a86c61812637c7dd0c57e29880cffd477b62f2e7 tree 10737307293afde2999a887cfeac32c7d7584aa7 parent c3fcc8137ce4296ad6ab94f88bd60cbe03d21527 author Alex Tomas Wed, 11 Oct 2006 01:21:03 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:16 -0700 [PATCH] ext3: add extent map support On disk extents format: /* * this is extent on-disk structure * it's used at the bottom of the tree */ struct ext3_extent { __le32 ee_block; /* first logical block extent covers */ __le16 ee_len; /* number of blocks covered by extent */ __le16 ee_start_hi; /* high 16 bits of physical block */ __le32 ee_start; /* low 32 bigs of physical block */ }; Signed-off-by: Alex Tomas Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c3fcc8137ce4296ad6ab94f88bd60cbe03d21527 tree 9f5b4f3cc6d1e12d10c6c687afa0f461ef1b8843 parent dab291af8d6307a3075c3d67d0cc8f98e646cb94 author Dave Kleikamp Wed, 11 Oct 2006 01:21:02 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:16 -0700 [PATCH] jbd2: cleanup ext4_jbd.h To allow ext4 to build during the transition from jbd to jbd2, we have both ext4_jbd.h and ext4_jbd2.h in the tree. We no longer need the former. Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dab291af8d6307a3075c3d67d0cc8f98e646cb94 tree a2207ab3e2e00472e5e3c969ad0dd211fb9e4151 parent a920e9416b3469994860ab552dfd7fd5a5aff162 author Mingming Cao Wed, 11 Oct 2006 01:21:01 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:16 -0700 [PATCH] jbd2: enable building of jbd2 and have ext4 use it rather than jbd Reworked from a patch by Mingming Cao and Randy Dunlap Signed-off-By: Randy Dunlap Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a920e9416b3469994860ab552dfd7fd5a5aff162 tree 9919991a89614a059fafd91b93666e8487606f3d parent f7f4bccb729844a0fa873e224e3a6f7eeed095bb author Johann Lombardi Wed, 11 Oct 2006 01:21:00 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:15 -0700 [PATCH] jbd2: rename slab jbd and jbd2 currently use the same slab names which must be unique. The patch below just renames jbd2's slabs. Signed-off-by: Johann Lombardi Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit f7f4bccb729844a0fa873e224e3a6f7eeed095bb tree b5b8ce65b5c17b4a7d45e43a3530f2cc977fb894 parent 470decc613ab2048b619a01028072d932d9086ee author Mingming Cao Wed, 11 Oct 2006 01:20:59 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:15 -0700 [PATCH] jbd2: rename jbd2 symbols to avoid duplication of jbd symbols Mingming Cao originally did this work, and Shaggy reproduced it using some scripts from her. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 470decc613ab2048b619a01028072d932d9086ee tree 5268576f5099040db94b8e984983c0bb28b2a9a7 parent 02ea2104c55b625cf5b5d9ba8586a4fc17920f5c author Dave Kleikamp Wed, 11 Oct 2006 01:20:57 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:15 -0700 [PATCH] jbd2: initial copy of files from jbd This is a simple copy of the files in fs/jbd to fs/jbd2 and /usr/incude/linux/[ext4_]jbd.h to /usr/include/[ext4_]jbd2.h Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 02ea2104c55b625cf5b5d9ba8586a4fc17920f5c tree fc7b380eb0f77307902379436c3a9cfca9330737 parent 617ba13b31fbf505cc21799826639ef24ed94af0 author Mingming Cao Wed, 11 Oct 2006 01:20:56 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:15 -0700 [PATCH] ext4: enable building of ext4 Originally part of a patch from Mingming Cao and Randy Dunlap. Reorganized by Shaggy. Signed-off-by: Randy Dunlap Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 617ba13b31fbf505cc21799826639ef24ed94af0 tree 2a41e8c993f7c1eed115ad24047d546ba56cbdf5 parent ac27a0ec112a089f1a5102bc8dffc79c8c815571 author Mingming Cao Wed, 11 Oct 2006 01:20:53 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:15 -0700 [PATCH] ext4: rename ext4 symbols to avoid duplication of ext3 symbols Mingming Cao originally did this work, and Shaggy reproduced it using some scripts from her. Signed-off-by: Mingming Cao Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ac27a0ec112a089f1a5102bc8dffc79c8c815571 tree bcbcc0a5a88bf99b35119d9d9d660a37c503d787 parent 502717f4e112b18d9c37753a32f675bec9f2838b author Dave Kleikamp Wed, 11 Oct 2006 01:20:50 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:15 -0700 [PATCH] ext4: initial copy of files from ext3 Start of the ext4 patch series. See Documentation/filesystems/ext4.txt for details. This is a simple copy of the files in fs/ext3 to fs/ext4 and /usr/incude/linux/ext3* to /usr/include/ex4* Signed-off-by: Dave Kleikamp Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 502717f4e112b18d9c37753a32f675bec9f2838b tree 90e674229bbd7caa05e740dfe719cf8749d0eb27 parent 97c7801cd5b0bb6a38c16108a496235474dc6310 author Chen, Kenneth W Wed, 11 Oct 2006 01:20:46 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:15 -0700 [PATCH] hugetlb: fix linked list corruption in unmap_hugepage_range() commit fe1668ae5bf0145014c71797febd9ad5670d5d05 causes kernel to oops with libhugetlbfs test suite. The problem is that hugetlb pages can be shared by multiple mappings. Multiple threads can fight over page->lru in the unmap path and bad things happen. We now serialize __unmap_hugepage_range to void concurrent linked list manipulation. Such serialization is also needed for shared page table page on hugetlb area. This patch will fixed the bug and also serve as a prepatch for shared page table. Signed-off-by: Ken Chen Cc: Hugh Dickins Cc: David Gibson Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 97c7801cd5b0bb6a38c16108a496235474dc6310 tree 04b17b411a39f23404bd58346156fda0055b945c parent dea20a3fbdd08e5ae2a0b33d2577c794a3764a11 author Rafael J. Wysocki Wed, 11 Oct 2006 01:20:45 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:14 -0700 [PATCH] swsusp: Use suspend_console Add suspend_console() and resume_console() to the suspend-to-disk code paths so that the users of netconsole can use swsusp with it. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dea20a3fbdd08e5ae2a0b33d2577c794a3764a11 tree 7bc5d319c2586205a40fd4e156b54d522e1f2626 parent c37e108d156101dcde7ec7033eabe7abe83366bc author Heiko Carstens Wed, 11 Oct 2006 01:20:44 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:14 -0700 [PATCH] Disable DETECT_SOFTLOCKUP for s390 We got several false bug reports because of enabled CONFIG_DETECT_SOFTLOCKUP. Disable soft lockup detection on s390, since it doesn't work on a virtualized architecture. Cc: Martin Schwidefsky Signed-off-by: Heiko Carstens Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c37e108d156101dcde7ec7033eabe7abe83366bc tree 2d576b612fc7939dab64279c36a1d0f0a016d38f parent 1db11ea65eaf1e7f6a70805fe52bc0aef53f68ef author Aneesh Kumar K.V Wed, 11 Oct 2006 01:20:43 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:14 -0700 [PATCH] use struct irq_chip instead of struct hw_interrupt_type hw_interrupt_type is deprecated in favour of struct irq_chip. [mingo@elte.hu: do x86_64 too] Acked-by: Thomas Gleixner Acked-by: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1db11ea65eaf1e7f6a70805fe52bc0aef53f68ef tree a4d204489d242431ab4bc4a9c0bc30fadce60973 parent b888132b0ff29ca0733589a594c243ed612438eb author Luca Tettamanti Wed, 11 Oct 2006 01:20:41 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:14 -0700 [PATCH] Fix menuconfig build failure due to missing stdbool.h scripts/kconfig/lxdialog/util.c fails to build because it uses true/false without including stdbool.h: kronos:~/src/linux-2.6$ make O=../linux-build-git menuconfig GEN /home/kronos/src/linux-build/Makefile HOSTCC scripts/kconfig/lxdialog/util.o /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c: In function 'set_classic_theme': /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:68: error: 'true' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:68: error: (Each undeclared identifier is reported only once /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:68: error: for each function it appears in.) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:70: error: 'false' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c: In function 'set_blackbg_theme': /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:101: error: 'true' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:102: error: 'false' undeclared (first use in this function) /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c: In function 'set_bluetitle_theme': /home/kronos/src/linux-2.6/scripts/kconfig/lxdialog/util.c:144: error: 'true' undeclared (first use in this function) make[2]: *** [scripts/kconfig/lxdialog/util.o] Error 1 make[1]: *** [menuconfig] Error 2 make: *** [menuconfig] Error 2 Add to dialog.h to fix the breakage. Signed-off-by: Luca Tettamanti Cc: Sam Ravnborg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit b888132b0ff29ca0733589a594c243ed612438eb tree 6bb64b98ed5f835db3bc7ddfe3a79788fe9890f4 parent 6391af174ad75f72e92043c1dd8302660a2fec58 author Mel Gorman Wed, 11 Oct 2006 01:20:40 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:14 -0700 [PATCH] mm: remove memmap_zone_idx() memmap_zone_idx() is not used anymore. It was required by an earlier version of account-for-memmap-and-optionally-the-kernel-image-as-holes.patch but not any more. Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6391af174ad75f72e92043c1dd8302660a2fec58 tree 43dfb9a1acfbdabb820180834d4e8efdcfcbe46e parent 4e0fadfcf62e252d2b14de0e0927eb2830c0c28c author Mel Gorman Wed, 11 Oct 2006 01:20:39 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:14 -0700 [PATCH] mm: use symbolic names instead of indices for zone initialisation Arch-independent zone-sizing is using indices instead of symbolic names to offset within an array related to zones (max_zone_pfns). The unintended impact is that ZONE_DMA and ZONE_NORMAL is initialised on powerpc instead of ZONE_DMA and ZONE_HIGHMEM when CONFIG_HIGHMEM is set. As a result, the the machine fails to boot but will boot with CONFIG_HIGHMEM turned off. The following patch properly initialises the max_zone_pfns[] array and uses symbolic names instead of indices in each architecture using arch-independent zone-sizing. Two users have successfully booted their powerpcs with it (one an ibook G4). It has also been boot tested on x86, x86_64, ppc64 and ia64. Please merge for 2.6.19-rc2. Credit to Benjamin Herrenschmidt for identifying the bug and rolling the first fix. Additional credit to Johannes Berg and Andreas Schwab for reporting the problem and testing on powerpc. Signed-off-by: Mel Gorman Cc: Benjamin Herrenschmidt Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4e0fadfcf62e252d2b14de0e0927eb2830c0c28c tree eb88e5fe9c32e352dabb4e2d62e3492604565c7b parent 41716c7c21b15e7ecf14f0caf1eef3980707fb74 author Haavard Skinnemoen Wed, 11 Oct 2006 01:20:37 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:14 -0700 [PATCH] IRQ: Fix AVR32 breakage Make the necessary changes to AVR32 required by the irq regs stuff. Signed-off-by: Haavard Skinnemoen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 41716c7c21b15e7ecf14f0caf1eef3980707fb74 tree 622cd9c92a31969681ef2c0cd865147dfa495933 parent 7e491092e442b3f8c0d90d470b398fdb74703ec7 author Eric Sesterhenn Wed, 11 Oct 2006 01:20:37 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:14 -0700 [PATCH] null dereference in fs/jbd/journal.c Since commit d1807793e1e7e502e3dc047115e9dbc3b50e4534 we dereference a NULL pointer. Coverity id #1432. We set journal to NULL, and use it directly afterwards. Signed-off-by: Eric Sesterhenn Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7e491092e442b3f8c0d90d470b398fdb74703ec7 tree 22d7cd5bb83da4e669c2526bd7b18b6f23eecfcc parent 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 author Andrew Morton Wed, 11 Oct 2006 01:20:35 -0700 committer Linus Torvalds Wed, 11 Oct 2006 11:14:14 -0700 [PATCH] revert "nvidiafb: use generic ddc reading" Olaf reports that this gave him a black screen. Cc: Olaf Hering Cc: "Antonino A. Daplas" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 75e9de18f079a51fa987ef0703112d5bc125fdb7 tree e9bdf9972851d7de6a8b5392bd4666f6fa96046d parent 12975aef62836e9f3e179afaaded8045f8a25ac4 author Christian Borntraeger Wed, 11 Oct 2006 15:31:52 +0200 committer Martin Schwidefsky Wed, 11 Oct 2006 15:31:52 +0200 [S390] stacktrace bug. The latest kernel 2.6.19-rc1 triggers a bug in the s390 specific stack trace code when compiled with gcc 3.4. This patch fixes the latest lock dependency validator code (2.6.19-rc1) on s390 gcc 3.4. The variable sp was fixed to r15 (which is the stack pointer in the s390 abi) and assigned new values to r15. Therefore, gcc 3.4 assigns a new value to r15 and does not restore it on exit (r15 is supposed to be call save) - the kernel stack is broken. Avoid trouble by not assigning any new value to sp (r15). Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 12975aef62836e9f3e179afaaded8045f8a25ac4 tree 719a2622de3bd09d11372b535a7fba98aeedb50e parent e7769b48a0216d7262fe2ba59b1b3697be462cbb author Cornelia Huck Wed, 11 Oct 2006 15:31:47 +0200 committer Martin Schwidefsky Wed, 11 Oct 2006 15:31:47 +0200 [S390] cio: remove casts from/to (void *). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit e7769b48a0216d7262fe2ba59b1b3697be462cbb tree a46d8a60d428c24183309ec5de08676ffc504191 parent 789642680518b28e7dc13f96061460a8238ec622 author Cornelia Huck Wed, 11 Oct 2006 15:31:41 +0200 committer Martin Schwidefsky Wed, 11 Oct 2006 15:31:41 +0200 [S390] cio: Remove grace period for vary off chpid. The grace period handling introduced needless complexity. It didn't help the dasd driver (which can handle terminated I/O just well), and it doesn't help for long running channel programs (which won't complete during the grace period anyway). Terminating I/O using a path that just disappeared immediately is much more consistent with what the user expects. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 789642680518b28e7dc13f96061460a8238ec622 tree 144df81a9154783e1b0299e66679099e3ddef1a4 parent 715d854bc215bbcca35097176d674c3ac58a085c author Cornelia Huck Wed, 11 Oct 2006 15:31:38 +0200 committer Martin Schwidefsky Wed, 11 Oct 2006 15:31:38 +0200 [S390] cio: Use ccw_dev_id and subchannel_id in ccw_device_private Use the proper structures to identify device and subchannel. Change get_disc_ccwdev_by_devno() to get_disc_ccwdev_by_dev_id(). Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 715d854bc215bbcca35097176d674c3ac58a085c tree 3240ff6a457871f2ef12cb46c04d782bfb184c82 parent 08983787d2ccab64cb790965ba89621d96cc22c1 author Melissa Howland Wed, 11 Oct 2006 15:31:34 +0200 committer Martin Schwidefsky Wed, 11 Oct 2006 15:31:34 +0200 [S390] monwriter kzalloc size. Fix length on kzalloc for data buffer so as to not overwrite unallocated storage. Signed-off-by: Melissa Howland Signed-off-by: Martin Schwidefsky commit 08983787d2ccab64cb790965ba89621d96cc22c1 tree 39f90a0ca84b4554eeb505589e1775e7a0cf4197 parent 9d0a57cbdb4976f382eb1c03baee338e467b6592 author Cornelia Huck Wed, 11 Oct 2006 15:31:30 +0200 committer Martin Schwidefsky Wed, 11 Oct 2006 15:31:30 +0200 [S390] cio: add missing KERN_INFO printk header. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 9d0a57cbdb4976f382eb1c03baee338e467b6592 tree d224342e631bddc9ccd8b6e2aa89989a9c380182 parent 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 author Heiko Carstens Wed, 11 Oct 2006 15:31:26 +0200 committer Martin Schwidefsky Wed, 11 Oct 2006 15:31:26 +0200 [S390] irq change improvements. Remove the last few places where a pointer to pt_regs gets passed. Also make sure we call set_irq_regs() before irq_enter() and after irq_exit(). This doesn't fix anything but makes sure s390 looks the same like all other architectures. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 701328a7b58d50d8640c21ba5fdf3170b1ddac16 tree 99a3fe44310a97e92ad1cb3a01f2ee3f6ed0d59a parent 53e36ada37cb8b01cfbf674580a79edc0bb764c7 parent 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 author Jeff Garzik Wed, 11 Oct 2006 04:59:46 -0400 committer Jeff Garzik Wed, 11 Oct 2006 04:59:46 -0400 Merge branch 'master' into upstream-fixes commit 53e36ada37cb8b01cfbf674580a79edc0bb764c7 tree 6698290a865cb1f0eba4b4065b1a4a3fdf42d0c3 parent a83068bbaca39197dca26287c16186baee615f0a author Peter Korsgaard Mon, 09 Oct 2006 09:53:09 +0200 committer Jeff Garzik Wed, 11 Oct 2006 04:48:52 -0400 [PATCH] pata-qdi: fix le32 in data_xfer The following tiny patch fixes a typo in qdi_data_xfer (le32 instead of le16). Signed-off-by: Peter Korsgaard Signed-off-by: Jeff Garzik commit a83068bbaca39197dca26287c16186baee615f0a tree acfd71597821eceeee6b21b905d9a1b8cb91bcc0 parent bbe1fe7ea3438f8c4447dbcd46a126581ed2ed41 author Jeff Garzik Wed, 11 Oct 2006 04:46:52 -0400 committer Jeff Garzik Wed, 11 Oct 2006 04:46:52 -0400 [libata] sata_promise: add PCI ID Noticed by Steve Brown Signed-off-by: Jeff Garzik commit bbe1fe7ea3438f8c4447dbcd46a126581ed2ed41 tree 5b1eec4a822887a2f1380f6a0aa649322c986a91 parent 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 author Eran Tromer Tue, 10 Oct 2006 14:29:25 -0700 committer Jeff Garzik Wed, 11 Oct 2006 04:18:07 -0400 [PATCH] libata: return sense data in HDIO_DRIVE_CMD ioctl Make the HDIO_DRIVE_CMD ioctl in libata (ATA command pass through) return a few ATA registers to userspace, following the same convention as the drivers/ide implementation of the same ioctl. This is needed to support ATA commands like CHECK POWER MODE, which return information in nsectors. This fixes "hdparm -C" on SATA drives. Forcing the sense data read via the cc flag causes spurious check conditions, so we filter these out (following the ATA command pass-through specification T10/04-262r7). Signed-off-by: Eran Tromer Acked-by: Tejun Heo Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 4a1d2d81fa327d095a0a8a1f961bace5b0a2f7da tree 2ff94cde659bce8bee2be13d2da7b3c19ef335c8 parent 6e532cfe49b6e961e1260642a44959b645e9ab54 author Helge Deller Fri, 06 Oct 2006 12:12:34 -0600 committer Jeff Garzik Wed, 11 Oct 2006 04:07:45 -0400 [PATCH] Fix section mismatch in de2104x.c WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to .init.text:de_init_one from .data.rel.local after 'de_driver' (at offset 0x20) WARNING: drivers/net/tulip/de2104x.o - Section mismatch: reference to .exit.text:de_remove_one from .data.rel.local after 'de_driver' (at offset 0x28) Signed-off-by: Helge Deller Signed-off-by: Kyle McMartin Signed-off-by: Matthew Wilcox Signed-off-by: Jeff Garzik commit 6e532cfe49b6e961e1260642a44959b645e9ab54 tree 4e04ee6db5cef2fc0ec9f48e074c2077f77b54fb parent 7bd656d12119708b37414bf909ab2995473da818 author Stephen Hemminger Mon, 09 Oct 2006 15:49:27 -0700 committer Jeff Garzik Wed, 11 Oct 2006 04:07:45 -0400 [PATCH] sky2: set lower pause threshold to prevent overrun Adjust the pause threshold on slower systems to keep from getting overrun. Since FIFO is 2K bytes, don't send XON pause until there is space for a full frame. Signed-off-by: Jeff Garzik commit 7bd656d12119708b37414bf909ab2995473da818 tree ef32cd6d47d0f3eef843fd239be6f660c0cc0af6 parent 370de6cdc2ed27c41b313c031e4258ffa32272bc author Stephen Hemminger Mon, 09 Oct 2006 14:40:38 -0700 committer Jeff Garzik Wed, 11 Oct 2006 04:07:45 -0400 [PATCH] sky2: revert pci express extensions The pci express error handling extensions don't work unless PCI access is via mmconfig. Otherwise, all accesses to pci config registers greater than 256 fail. Since the sky2 driver has other ways of getting to PCI config space, it works around this short coming, but the pci_find_ext_capablity doesn't work. This backs out commit 91aeb3edbcf4e6ed72d138ac8c22fd68e6d717c3 Go back to hardcoding, since we know where the error registers are anyway. Fixes http://bugzilla.kernel.org/show_bug.cgi?id=7222 Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 370de6cdc2ed27c41b313c031e4258ffa32272bc tree abf59e2ca970ef4521b3c2fd413aabac173280f1 parent 5d5c8e03786691d0d083142b922edce8609c0fd5 author Stephen Hemminger Thu, 05 Oct 2006 15:49:53 -0700 committer Jeff Garzik Wed, 11 Oct 2006 04:06:09 -0400 [PATCH] skge: version 1.9 Want to be able to track downstream impact of fiber related fixes. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 5d5c8e03786691d0d083142b922edce8609c0fd5 tree a821bad020b3a961e9af512803aca9804169fcd1 parent 4b67be999ed5bfb1bfe4cc502d37d59b4f6b6b7f author Stephen Hemminger Thu, 05 Oct 2006 15:49:52 -0700 committer Jeff Garzik Wed, 11 Oct 2006 04:06:09 -0400 [PATCH] skge: better flow control negotiation Do flow control negotiation properly. Don't let auto negotiation status limit renegotiation. Separate desired pause values from the result of auto negotiation. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 4b67be999ed5bfb1bfe4cc502d37d59b4f6b6b7f tree 04eccfdda3f2ee5dbd16ca336ede71ce662ef944 parent a1bc9b875be597cdf147db2748ba7ddc6b0f0fbe author Stephen Hemminger Thu, 05 Oct 2006 15:49:51 -0700 committer Jeff Garzik Wed, 11 Oct 2006 04:06:09 -0400 [PATCH] skge: pause mapping for fiber Do correct mapping of pause and duplex when using 1000BaseX fiber versions of the board. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit a1bc9b875be597cdf147db2748ba7ddc6b0f0fbe tree a4820b33026072c5a3e0fb1b8a1d1b37184fd286 parent 647519100105fb4ddfe6455e820093999c08c4be author Stephen Hemminger Thu, 05 Oct 2006 15:49:50 -0700 committer Jeff Garzik Wed, 11 Oct 2006 04:06:08 -0400 [PATCH] skge: fix stuck irq when fiber down The PHY interrupt from the internal fiber is getting stuck on when the link is down. Add code to handle the transition and mask it. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik commit 647519100105fb4ddfe6455e820093999c08c4be tree 77904601b90229dd0cae65d01e4c2338fa1ac049 parent 348bc2a6e306dc3e875cee3389e1405963ace617 author Linas Vepstas Tue, 10 Oct 2006 16:22:29 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:27 -0400 [PATCH] powerpc/cell spidernet release all descrs Bugfix: rx descriptor release function fails to visit the last entry while walking receive descriptor ring. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 348bc2a6e306dc3e875cee3389e1405963ace617 tree e0801413480b419d9a7143b05f1f90f83f14477f parent 66c097165cf6d4196e798145fb33c768164fb361 author Linas Vepstas Tue, 10 Oct 2006 16:21:10 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:27 -0400 [PATCH] powerpc/cell spidernet DMA direction fix The ring buffer descriptors are DMA-accessed bidirectionally, but are not declared in this way. Fix this. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 66c097165cf6d4196e798145fb33c768164fb361 tree 4da337fe4c5eb0d86cc8867d06c916ec27d6e33a parent a664ccf430547696951bf3949f5a2de5079ece5a author Linas Vepstas Tue, 10 Oct 2006 16:19:34 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:27 -0400 [PATCH] powerpc/cell spidernet variable name change Cosmetic patch: give the variable holding the numer of descriptors a more descriptive name, so to avoid confusion. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit a664ccf430547696951bf3949f5a2de5079ece5a tree 53fc9fdba563fe8f70c9a3de51b78c52de84fe23 parent 499eea18722e43f0ee15e11ac16ffcbd10b70b24 author Linas Vepstas Tue, 10 Oct 2006 16:18:18 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:26 -0400 [PATCH] powerpc/cell spidernet reduce DMA kicking The current code attempts to start the TX dma every time a packet is queued. This is too conservative, and wastes CPU time. This patch changes behaviour to call the kick-dma function less often, only when the tx queue is at risk of emptying. This reduces cpu usage, improves performance. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 499eea18722e43f0ee15e11ac16ffcbd10b70b24 tree ec34ee9afd0759166a7f426222df3ccbedb4c4bb parent 9cc7bf7edf50a8a6b456b337aff97fe780ae369b author Linas Vepstas Tue, 10 Oct 2006 16:15:29 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:26 -0400 [PATCH] powerpc/cell spidernet Remove a dummy register read that is not needed. This reduces CPU usage notably during transmit. Signed-off-by: Linas Vepstas Cc: Arnd Bergmann Cc: James K Lewis Signed-off-by: Jeff Garzik commit 9cc7bf7edf50a8a6b456b337aff97fe780ae369b tree 9512ef8f08a21ab7fa9398fdd31f1ad1810a4702 parent 68a8c609b3071c2441fa64f584d15311f2c10e61 author Linas Vepstas Tue, 10 Oct 2006 16:14:29 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:26 -0400 [PATCH] powerpc/cell spidernet refine locking The transmit side of the spider ethernet driver currently places locks around some very large chunks of code. This results in a fair amount of lock contention is some cases. This patch makes the locks much more fine-grained, protecting only the cirtical sections. One lock is used to protect three locations: the queue head and tail pointers, and the queue low-watermark location. Signed-off-by: Linas Vepstas Cc: Arnd Bergmann Cc: James K Lewis Signed-off-by: Jeff Garzik commit 68a8c609b3071c2441fa64f584d15311f2c10e61 tree 4b58a435e0dd351517366051896a92997bba2771 parent 204e5fa17c7ba45a89989f8da6dfe8e54d64b79b author Linas Vepstas Tue, 10 Oct 2006 16:13:05 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:26 -0400 [PATCH] powerpc/cell spidernet NAPI polling info. This patch moves transmit queue cleanup code out of the interrupt context, and into the NAPI polling routine. Signed-off-by: Linas Vepstas Acked-by: Arnd Bergmann Cc: James K Lewis Signed-off-by: Jeff Garzik commit 204e5fa17c7ba45a89989f8da6dfe8e54d64b79b tree e69b3c2989839bac94718c6be16dd1433da30c12 parent b21606a773faffc2b3ec326325c433bdf37ecbdf author Linas Vepstas Tue, 10 Oct 2006 16:11:33 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:26 -0400 [PATCH] powerpc/cell spidernet low watermark patch. Implement basic low-watermark support for the transmit queue. Hardware low-watermarks allow a properly configured kernel to continously stream data to a device and not have to handle any interrupts at all in doing so. Correct zero-interrupt operation can be actually observed for this driver, when the socket buffer is made large enough. The basic idea of a low-watermark interrupt is as follows. The device driver queues up a bunch of packets for the hardware to transmit, and then kicks the hardware to get it started. As the hardware drains the queue of pending, untransmitted packets, the device driver will want to know when the queue is almost empty, so that it can queue some more packets. If the queue drains down to the low waterark, then an interrupt will be generated. However, if the kernel/driver continues to add enough packets to keep the queue partially filled, no interrupt will actually be generated, and the hardware can continue streaming packets indefinitely in this mode. The impelmentation is done by setting the DESCR_TXDESFLG flag in one of the packets. When the hardware sees this flag, it will interrupt the device driver. Because this flag is on a fixed packet, rather than at fixed location in the queue, the code below needs to move the flag as more packets are queued up. This implementation attempts to keep the flag at about 1/4 from "empty". Signed-off-by: Linas Vepstas Signed-off-by: James K Lewis Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit b21606a773faffc2b3ec326325c433bdf37ecbdf tree 59bfbf079f3770ead9e3a5eae777d0f972ddc7e9 parent 98b9040c747e50fe02ad616c9d5fee9aa4017cd1 author Linas Vepstas Tue, 10 Oct 2006 16:09:40 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:26 -0400 [PATCH] powerpc/cell spidernet incorrect offset Bugfix -- the rx chain is in memory after the tx chain -- the offset being used was wrong, resulting in memory corruption when the size of the rx and tx rings weren't exactly the same. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 98b9040c747e50fe02ad616c9d5fee9aa4017cd1 tree 68a91127f33ee40e1a7e0b31ceffc5c8d1f52092 parent 37aad7500bf7064bf150ea1f234303f4173f7b24 author Linas Vepstas Tue, 10 Oct 2006 16:08:42 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:26 -0400 [PATCH] powerpc/cell spidernet stop error printing patch. Turn off mis-interpretation of the queue-empty interrupt status bit as an error. Signed-off-by: Linas Vepstas Signed-off-by: James K Lewis Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 37aad7500bf7064bf150ea1f234303f4173f7b24 tree 4f9df50eba9cb3151e4215e8cc2c4b445fcce795 parent 43932d938d5a193bf9602b0ac8aa6783ba78b1aa author Linas Vepstas Tue, 10 Oct 2006 16:06:53 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:26 -0400 [PATCH] powerpc/cell spidernet fix error interrupt print The print message associated with the descriptor chain end interrupt prints a bogs value. Fix that. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 43932d938d5a193bf9602b0ac8aa6783ba78b1aa tree 8e696e8c9731bb48d8aaf02343a4ba64ea2aafff parent 313ef4b76c96ef427a7613d89df550aa5d02bf21 author Linas Vepstas Tue, 10 Oct 2006 16:05:00 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:25 -0400 [PATCH] powerpc/cell spidernet bogus rx interrupt bit The current receive interrupt mask sets a bogus bit that doesn't even belong to the definition of this register. Remove it. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 313ef4b76c96ef427a7613d89df550aa5d02bf21 tree 18f8b861654c5f43af67da3b1b646269197677e2 parent ded8028a0b61075d841c33a412da5c869140d7aa author Linas Vepstas Tue, 10 Oct 2006 16:04:00 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:25 -0400 [PATCH] Spidernet stop queue when queue is full. This patch adds a call to netif_stop_queue() when there is no more room for more packets on the transmit queue. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit ded8028a0b61075d841c33a412da5c869140d7aa tree ad6baf770db94d5b24da02a5fcd92b1e3e97cb76 parent 917a5b8e648f420105158023ae0317eb0e77a2d5 author Linas Vepstas Tue, 10 Oct 2006 16:02:54 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:25 -0400 [PATCH] Spidernet fix register field definitions This patch fixes the names of a few fields in the DMA control register. There is no functional change. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 917a5b8e648f420105158023ae0317eb0e77a2d5 tree dc45b2a495d1187a4fdbeb68dd228684d93f09f1 parent 808999c9a4749dc67c39bf52f712d0c27aa00e67 author Linas Vepstas Tue, 10 Oct 2006 16:01:51 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:25 -0400 [PATCH] powerpc/cell spidernet add missing netdev watchdog Set the netdev watchdog timer. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit 808999c9a4749dc67c39bf52f712d0c27aa00e67 tree 7a6f8879857ca81fa36194e6d14e9f66a42ed2eb parent c3fee4c55915c42b3278b65c91f9be8cee13426e author Linas Vepstas Tue, 10 Oct 2006 16:01:00 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:25 -0400 [PATCH] powerpc/cell spidernet zlen min packet length Polite device drivers pad short packets to 60 bytes, so that mean-spirited users don't accidentally DOS some other OS that can't handle short packets. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit c3fee4c55915c42b3278b65c91f9be8cee13426e tree 171c86bbbed7af79d373aeda531052b0a64e4190 parent e2874f2e8c3695953b9ec26d396d678a7128ee64 author Linas Vepstas Tue, 10 Oct 2006 16:00:04 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:25 -0400 [PATCH] powerpc/cell spidernet force-end fix Bugfix: when cleaning up the transmit queue upon device close, be sure to walk the entire queue. Signed-off-by: Linas Vepstas Cc: James K Lewis Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit e2874f2e8c3695953b9ec26d396d678a7128ee64 tree 0256e7192cd3e43cba0905a7c995cafb198805b6 parent a02d601dd59d08a77563499cc05b48603df8f4a4 author Linas Vepstas Tue, 10 Oct 2006 15:59:02 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:25 -0400 [PATCH] Spidernet module parm permissions The module param permsissions should bw read-only, not writable. From: James K Lewis Signed-off-by: James K Lewis Signed-off-by: Linas Vepstas Cc: Arnd Bergmann Signed-off-by: Jeff Garzik commit a02d601dd59d08a77563499cc05b48603df8f4a4 tree c2a97e2217d0d5149f73e497b5ae4a08746e349e parent 90f10841180e9b7938f63db69e90dacb7d21bbe5 author Linas Vepstas Tue, 10 Oct 2006 15:57:26 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:25 -0400 [PATCH] powerpc/cell spidernet burst alignment patch. This patch increases the Burst Address alignment from 64 to 1024 in the Spidernet driver. This improves transmit performance for large packets. From: James K Lewis Signed-off-by: James K Lewis Signed-off-by: Linas Vepstas Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit 90f10841180e9b7938f63db69e90dacb7d21bbe5 tree 75f99aad7065cd3562e3516a337df72f84391e0c parent bff0a55f34e62970203c4af9c8ef4dc7d73e2f96 author Linas Vepstas Tue, 10 Oct 2006 15:56:04 -0500 committer Jeff Garzik Wed, 11 Oct 2006 04:04:24 -0400 [PATCH] powerpc/cell spidernet ethtool -i version number info. This patch adds version information as reported by ethtool -i to the Spidernet driver. From: James K Lewis Signed-off-by: James K Lewis Signed-off-by: Linas Vepstas Acked-by: Arnd Bergmann Signed-off-by: Jeff Garzik commit bff0a55f34e62970203c4af9c8ef4dc7d73e2f96 tree 59d6e5896ec96e97fdfa2ca875e25498934ee553 parent 08093c8fd66ef7a8c2f887812cc98c54f5f12703 author Jan-Bernd Themann Thu, 05 Oct 2006 16:53:14 +0200 committer Jeff Garzik Wed, 11 Oct 2006 03:58:26 -0400 [PATCH] ehea: fix port state notification, default queue sizes This patch includes a bug fix for the port state notification and fixes the default queue sizes. Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit 08093c8fd66ef7a8c2f887812cc98c54f5f12703 tree ca97d7e2123c29647d32291b32345742a05ed5dd parent 5f77113c01d8a9f8193769d2ca73763047af39ef author Jan-Bernd Themann Thu, 05 Oct 2006 16:53:12 +0200 committer Jeff Garzik Wed, 11 Oct 2006 03:58:26 -0400 [PATCH] ehea: firmware (hvcall) interface changes This eHEA patch covers required changes related to Anton Blanchard's new hvcall interface. Signed-off-by: Jan-Bernd Themann Signed-off-by: Jeff Garzik commit 5f77113c01d8a9f8193769d2ca73763047af39ef tree cd57cfba83ff2e1de4046b101c66de5e170a723a parent 6f62768344e46520ae585f3e201c9d3e497b028f author Andrew Morton Tue, 10 Oct 2006 14:33:30 -0700 committer Jeff Garzik Wed, 11 Oct 2006 03:56:33 -0400 [PATCH] ibmveth irq fix drivers/net/ibmveth.c:939: error: too many arguments to function `ibmveth_interrupt' Cc: Jeff Garzik Cc: Anton Blanchard Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 6f62768344e46520ae585f3e201c9d3e497b028f tree a11d61c6c351b04d09c575a6a83db814af968930 parent 12f417ee95bf98cd3e42d2a771f7c6d360159b9d author Michael Buesch Tue, 10 Oct 2006 14:33:26 -0700 committer Jeff Garzik Wed, 11 Oct 2006 03:56:33 -0400 [PATCH] b44: fix eeprom endianess issue This fixes eeprom read on big-endian architectures. readw returns the data in CPU order. With cpu_to_le16 we convert it to little endian, because "ptr" is a pointer to a _byte_ arrray. See the cast above. A byte array is little endian. The bug is: Reading u16 values with readw, casting them into an u8 array and accessing this u8 array as an u8 (byte) array. The correct fix is to swap the CPU-ordering value returned by readw into little endian, as the u8 array is little endian. This compiles to nothing on little endian hardware (so it does not change b44 code on LE hardware), but _fixes_ code on BE hardware. Signed-off-by: Michael Buesch Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 12f417ee95bf98cd3e42d2a771f7c6d360159b9d tree a8f9803e8bcfccf382b72c360d72f781d069c8b1 parent 24fcbacedb0d83cabc6761acbecfbf751265ce52 author Deepak Saxena Tue, 10 Oct 2006 14:33:22 -0700 committer Jeff Garzik Wed, 11 Oct 2006 03:56:33 -0400 [PATCH] Update smc91x driver with ARM Versatile board info We need to specify a Versatile-specific SMC_IRQ_FLAGS value or the new generic IRQ layer will complain thusly: No IRQF_TRIGGER set_type function for IRQ 25 () Signed-off-by: Deepak Saxena Cc: Jeff Garzik Cc: Russell King Cc: Nicolas Pitre Signed-off-by: Andrew Morton Signed-off-by: Jeff Garzik commit 24fcbacedb0d83cabc6761acbecfbf751265ce52 tree 7147b206304b028c3cfd5de6317e5c8510098ca9 parent 2f614fe04f4463ff22234133319067d7361f54e5 parent 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 author Jeff Garzik Wed, 11 Oct 2006 03:56:12 -0400 committer Jeff Garzik Wed, 11 Oct 2006 03:56:12 -0400 Merge branch 'master' into upstream-fixes commit 53a5fbdc2dff55161a206ed1a1385a8fa8055c34 tree 9a90f7160d7a44a8ddb3a51fdaec866e01f1a359 parent 0968cf51b6f2ca8a951de4b976370189cf43bbdd author Linus Torvalds Tue, 10 Oct 2006 17:14:44 -0700 committer Linus Torvalds Tue, 10 Oct 2006 17:14:44 -0700 ACPI: Allow setting SCI_EN bit in PM1_CONTROL register This is needed by at least the Mac Mini's, which (incorrectly) come back from suspend with SCI_EN clear. Thanks to Frédéric Riss for hunting this down. Acked-by: Frédéric Riss Cc: Pavel Machek Cc: Len Brown Cc: Arjan van de Ven Signed-off-by: Linus Torvalds commit 0968cf51b6f2ca8a951de4b976370189cf43bbdd tree fd29fb864a516b4c52e26700f0b1d782857c9797 parent 15e541feb340bc2a4caaf707ee5ad71a47fdd068 author Jeff Garzik Tue, 10 Oct 2006 02:58:14 -0400 committer Linus Torvalds Tue, 10 Oct 2006 16:29:37 -0700 [PATCH] firmware/dcdbas: fix bug in error cleanup The error path path mistakenly called sysfs_create_group() rather than sysfs_remove_group(). They take the same arguments, so it's easy to cut-n-paste such a bug. Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 15e541feb340bc2a4caaf707ee5ad71a47fdd068 tree 89c77fe53af13183b63745667269b748dca628db parent 3c693024cffa5c96a20b969f4efd058675e7700f author Jeff Garzik Tue, 10 Oct 2006 01:40:55 -0400 committer Linus Torvalds Tue, 10 Oct 2006 16:29:37 -0700 [PATCH] irda: donauboe fixes, cleanups - fix: toshoboe_invalid_dev() was recently removed, but not all callers were updated, causing the obvious linker error. Remove caller, because the check (like the one removed) isn't used. - fix: propagate request_irq() return value - cleanup: remove void* casts - cleanup: remove impossible ASSERTs Signed-off-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 3c693024cffa5c96a20b969f4efd058675e7700f tree 2e49a90c3e67a898770fe0ea735d00326dbe3f69 parent 107c3a73e0ee037322efa00fa3cb45b3b7eb6069 parent 10270613fb4d5a44c335cfa13e9626bf5743c01d author Linus Torvalds Tue, 10 Oct 2006 16:16:33 -0700 committer Linus Torvalds Tue, 10 Oct 2006 16:16:33 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Fix windfarm platform device usage [POWERPC] Fix i2c-powermac platform device usage [POWERPC] Fix secondary CPU startup on old "powersurge" SMP powermacs [POWERPC] ARCH=ppc pt_regs fixes [POWERPC] Update maple defconfig [POWERPC] Fix Maple secondary IDE interrupt [POWERPC] Make U4 PCIe work on maple [POWERPC] cell: fix default zImage build target [POWERPC] Fix boot wrapper invocation if CROSS_COMPILE contains spaces [POWERPC] Fix xmon IRQ handler for pt_regs removal commit 107c3a73e0ee037322efa00fa3cb45b3b7eb6069 tree eaec22eb602934ba4df4b119afcfca89d655412c parent 44aa5359be589f9cbe9cf0d5c97e22b27a04c7d3 author Al Viro Sun, 13 Aug 2006 15:38:04 -0400 committer Linus Torvalds Tue, 10 Oct 2006 16:15:34 -0700 [PATCH] endianness annotations in s2io Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 44aa5359be589f9cbe9cf0d5c97e22b27a04c7d3 tree d69dc626068b45e62f2456b1d7ab7ca08aff018f parent 3524de1c7953e7a22c43b9214ffc3680af6f8edb author Al Viro Sun, 13 Aug 2006 01:54:30 -0400 committer Linus Torvalds Tue, 10 Oct 2006 16:15:34 -0700 [PATCH] ufs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3524de1c7953e7a22c43b9214ffc3680af6f8edb tree 4a61cad0ca73b16082591f03adf817e8b2c1b1ac parent d136fe7243081a45a141bb297a7b7a627ab60fa9 author Al Viro Sat, 24 Dec 2005 14:39:13 -0500 committer Linus Torvalds Tue, 10 Oct 2006 16:15:34 -0700 [PATCH] fs/partitions endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d136fe7243081a45a141bb297a7b7a627ab60fa9 tree 23953313f3e648888e4ec49f2430430030cc0213 parent d02d48d8650bf3e2011f25373dbcf87f3c19f16b author Alexey Dobriyan Wed, 28 Dec 2005 22:27:10 +0300 committer Linus Torvalds Tue, 10 Oct 2006 16:15:34 -0700 [PATCH] Finish annotations of struct vlan_ethhdr Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit d02d48d8650bf3e2011f25373dbcf87f3c19f16b tree 436d4d5428a7a985cc3465c219897e9be2b6e27e parent 6ca1584173d0320f47464092eb180a17259cc3f9 author Al Viro Sat, 24 Dec 2005 14:33:09 -0500 committer Linus Torvalds Tue, 10 Oct 2006 16:15:34 -0700 [PATCH] isofs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6ca1584173d0320f47464092eb180a17259cc3f9 tree fe2f9edeb177534fc0e56af9deb9b51555911d70 parent 2ef1031282cd401b47a5f7f7477fe9ae69aff058 author Al Viro Sat, 24 Dec 2005 14:32:38 -0500 committer Linus Torvalds Tue, 10 Oct 2006 16:15:34 -0700 [PATCH] smbfs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2ef1031282cd401b47a5f7f7477fe9ae69aff058 tree da811802fac7a2d8f4271ea6ddbc5001305a870a parent 31b1f85b71b0b69afba89a60989097cd805f13c3 author Al Viro Sat, 24 Dec 2005 14:31:53 -0500 committer Linus Torvalds Tue, 10 Oct 2006 16:15:34 -0700 [PATCH] hpfs endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 31b1f85b71b0b69afba89a60989097cd805f13c3 tree 7c6d7b6d0223cb3755e6718a4028c1c68bbdf190 parent a9721f3152bc2be6702807705902e06abdd6e3bb author Al Viro Sat, 24 Dec 2005 14:31:04 -0500 committer Linus Torvalds Tue, 10 Oct 2006 16:15:34 -0700 [PATCH] fs/fat endianness annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a9721f3152bc2be6702807705902e06abdd6e3bb tree 4f01e2f3426697787330371ab822e7e60bc2238e parent e5201c58cd81066ecd0210bcc6c02e71200040a3 author Al Viro Sat, 24 Dec 2005 14:28:55 -0500 committer Linus Torvalds Tue, 10 Oct 2006 16:15:33 -0700 [PATCH] befs: endianness annotations split the data structures that exist in host- and disk-endian variants, annotate the fields of disk-endian ones, propagate changes. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e5201c58cd81066ecd0210bcc6c02e71200040a3 tree e066d8ba71d6f7ffc8183cf1a4f8cadff8fa30f5 parent 1151895f8076584e061092afffb110b90cb38a68 author Al Viro Sat, 24 Dec 2005 03:09:03 -0500 committer Linus Torvalds Tue, 10 Oct 2006 16:15:33 -0700 [PATCH] befs: missing fs32_to_cpu() in debug.c inode->mode is disk-endian Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1151895f8076584e061092afffb110b90cb38a68 tree b21948f944b9f949c629cef3027985f9e3cf53dc parent af10b0084dff530fb7232a0f8bbc4499e9c58574 author Al Viro Sat, 24 Dec 2005 01:32:03 -0500 committer Linus Torvalds Tue, 10 Oct 2006 16:15:33 -0700 [PATCH] befs: introduce on-disk endian types Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit af10b0084dff530fb7232a0f8bbc4499e9c58574 tree 584a22fa803e770c6dc684a04822f8db448d927f parent 88c124d847d0fc60531e45323752665b01fc14f0 author Al Viro Sat, 24 Dec 2005 01:13:13 -0500 committer Linus Torvalds Tue, 10 Oct 2006 16:15:33 -0700 [PATCH] befs: prepare to sanitizing headers pulled includes of endian.h from fs/befs/*.c to befs.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 88c124d847d0fc60531e45323752665b01fc14f0 tree 9480118c7f275a6e07a396fceef4b4db764a681e parent 7359bbfd85751de23079cc26cd248635aebe840b author Al Viro Fri, 23 Dec 2005 20:56:46 -0500 committer Linus Torvalds Tue, 10 Oct 2006 16:15:33 -0700 [PATCH] befs: remove bogus typedef Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7359bbfd85751de23079cc26cd248635aebe840b tree b562d57cf0d54119d0386bfaa18d849d90d0946b parent d08f74e58cad8f1844f6e01636a76dd52d41bb0f author Alexey Dobriyan Fri, 23 Dec 2005 01:18:25 +0300 committer Linus Torvalds Tue, 10 Oct 2006 16:15:33 -0700 [PATCH] chelsio: add endian annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit d08f74e58cad8f1844f6e01636a76dd52d41bb0f tree 9a365f16c8faa37f9115649c196972b33ed19f78 parent 56052d525a05ba9e53d4f11be2d5deee64924514 author Alexey Dobriyan Fri, 23 Dec 2005 01:12:25 +0300 committer Linus Torvalds Tue, 10 Oct 2006 16:15:33 -0700 [PATCH] serpent: fix endian warnings Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 56052d525a05ba9e53d4f11be2d5deee64924514 tree 798503b2208b232fe1525ac3beea173643b72b6d parent 70f38912935fd4aa3fea1ddf87ed1cee63109cc5 author Alexey Dobriyan Thu, 01 Dec 2005 17:10:40 -0500 committer Linus Torvalds Tue, 10 Oct 2006 16:15:33 -0700 [PATCH] cdrom: add endianness annotations Signed-off-by: Alexey Dobriyan Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 70f38912935fd4aa3fea1ddf87ed1cee63109cc5 tree 6d418457956697295c1d04b361a97134f19dd891 parent 3c5c6658d2f1385cf06cdc00db9f7f124a35fb25 author Al Viro Tue, 10 Oct 2006 22:49:57 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:24 -0700 [PATCH] use %p for pointers Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 3c5c6658d2f1385cf06cdc00db9f7f124a35fb25 tree 5f0a9ea9f10b2a6dddfa8599dda7d31ce1a306e7 parent 59bd59842617565b27acb0b55388363211123b9c author Al Viro Tue, 10 Oct 2006 22:49:47 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:24 -0700 [PATCH] use %zu for size_t Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 59bd59842617565b27acb0b55388363211123b9c tree 0b6daa7cb197cfc84c50d0d38afc566094b37155 parent cfbdbab0634cafae2c43371396e5443cf4d5d7bc author Al Viro Tue, 10 Oct 2006 22:49:37 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:24 -0700 [PATCH] missed const in prototype Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cfbdbab0634cafae2c43371396e5443cf4d5d7bc tree 8e9056d95242ea5e08a9816ed7a5f2eeb0ac7a2c parent 86b95c12139785a0f4c17cb7b4cb865e7084cd34 author Al Viro Tue, 10 Oct 2006 22:49:27 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:24 -0700 [PATCH] net/sunrpc/auth_gss/svcauth_gss.c endianness regression Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 86b95c12139785a0f4c17cb7b4cb865e7084cd34 tree 1ab601b463a5a5477e372045c4128b8b36668872 parent 5e7ddac75deaa2887e2b03441f9bed67ea8648d8 author Al Viro Tue, 10 Oct 2006 22:49:17 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:24 -0700 [PATCH] strndup() would better take size_t, not int Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5e7ddac75deaa2887e2b03441f9bed67ea8648d8 tree 33132b9f679d00d27447066fe9a61f1f18e35716 parent 1af9892811ad3bf2abb31566bfb2ec0b5070a66a author Al Viro Tue, 10 Oct 2006 22:49:07 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:23 -0700 [PATCH] ptrdiff_t is %t, not %z Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 1af9892811ad3bf2abb31566bfb2ec0b5070a66a tree 12ddef3fbd905592d37d6c1b6ece687c308253d2 parent e6c6e640b8b258dc7f60533e81f050d15fc0a9af author Al Viro Tue, 10 Oct 2006 22:48:57 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:23 -0700 [PATCH] cpuset ANSI prototype Signed-off-by: Al Viro Acked-by: Paul Jackson Signed-off-by: Linus Torvalds commit e6c6e640b8b258dc7f60533e81f050d15fc0a9af tree 288227e66788a0f16b8430ac6fc6dd1ede372330 parent 663d1ba2f1f66db43ab95350f965c1d9f2e3e5bc author Al Viro Tue, 10 Oct 2006 22:48:47 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:23 -0700 [PATCH] fs/inode.c NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 663d1ba2f1f66db43ab95350f965c1d9f2e3e5bc tree 2f797b4f4625443bbb1e7993be19f76047969eb6 parent ba674cfcbdb93cb560a4ae4d2c8b53cfbddc2d22 author Al Viro Tue, 10 Oct 2006 22:48:37 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:23 -0700 [PATCH] em28xx NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ba674cfcbdb93cb560a4ae4d2c8b53cfbddc2d22 tree 11188c54255760bf509d7e58aaa1d5da8d1d69ba parent a6ded1b0605376e18a17cb01977819bcf2677cdc author Al Viro Tue, 10 Oct 2006 22:48:27 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:23 -0700 [PATCH] __user annotations: loop.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a6ded1b0605376e18a17cb01977819bcf2677cdc tree ce1d4b12085fd8b29183f4aeb9b902e4bea9186b parent 03dc55064117508ad474f3eede3a77bf9fbb636f author Al Viro Tue, 10 Oct 2006 22:48:17 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:23 -0700 [PATCH] openprom NULL noise removal Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 03dc55064117508ad474f3eede3a77bf9fbb636f tree 8a3e4d4bfd97fc598f55e545df8991926f3cfbf0 parent 20241ad409fbc42d9e7f92f5fdb4783b7f1b36eb author Al Viro Tue, 10 Oct 2006 22:48:07 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:23 -0700 [PATCH] trivial iomem annotations: sata_promise Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 20241ad409fbc42d9e7f92f5fdb4783b7f1b36eb tree 2f6a12f447a259ba820ab055926bfb22400cb67b parent fa1f5ea860af34d74c1475eddde3364e71fac15d author Al Viro Tue, 10 Oct 2006 22:47:57 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:23 -0700 [PATCH] gfp annotations: radix_tree_root struct radix_tree_root has unused upper bits of ->gfp_mask reused for tags bitmap. Annotated. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fa1f5ea860af34d74c1475eddde3364e71fac15d tree e52736f361bea819db6750a372ba27e0f1a43f24 parent 86f93336543314ffc46787845b631029cf11d6f8 author Al Viro Tue, 10 Oct 2006 22:47:47 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:23 -0700 [PATCH] gfp annotations: scsi_error Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 86f93336543314ffc46787845b631029cf11d6f8 tree e6437d5435e5ffaabdb67de774490f4e1ce8a354 parent 29756fa3287ff702535e459e7ca8c6038f6e9ae3 author Al Viro Tue, 10 Oct 2006 22:47:37 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:23 -0700 [PATCH] ptrace32 trivial __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 29756fa3287ff702535e459e7ca8c6038f6e9ae3 tree b06d339fc08735ebb052723b86d139bf253ba1ba parent 4370df9782a8456039cf85d2b833c2c2097f3ded author Al Viro Tue, 10 Oct 2006 22:47:27 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:22 -0700 [PATCH] trivial iomem annotations: istallion Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4370df9782a8456039cf85d2b833c2c2097f3ded tree c074d9a5222c4d1d4768eec5e00722b4f91cd480 parent e4cad1b5a4851c90c1bcf460062074a2fa10815b author Al Viro Tue, 10 Oct 2006 22:47:17 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:22 -0700 [PATCH] acpi NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit e4cad1b5a4851c90c1bcf460062074a2fa10815b tree c627fb3cc0c711633eb3770c82be65fd77f17682 parent ba2397efe10ba728c7ff22b179e218c292227c13 author Al Viro Tue, 10 Oct 2006 22:47:07 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:22 -0700 [PATCH] passing pointer to setup_timer() should be via unsigned long Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ba2397efe10ba728c7ff22b179e218c292227c13 tree 00e55bb4ec8c27c522d78a51e1a3f42fb6177fce parent fb136e97840872638cb08588c4c9b9fff7f7c456 author Al Viro Tue, 10 Oct 2006 22:46:57 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:22 -0700 [PATCH] make kernel/relay.c __user-clean Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit fb136e97840872638cb08588c4c9b9fff7f7c456 tree 89fbea958dc498a153ae6f04fa658ea32e5944d5 parent afc12d30a74415a49a6ce36d89f82641b46c499b author Al Viro Tue, 10 Oct 2006 22:46:47 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:22 -0700 [PATCH] fix misannotation in ioc4.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit afc12d30a74415a49a6ce36d89f82641b46c499b tree 29fb2348614f1e07b285f317273612b196967573 parent a9f627c9df2b6a242cdc25d46f87191941cd0844 author Al Viro Tue, 10 Oct 2006 22:46:37 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:22 -0700 [PATCH] mtd: remove several bogus casts to void * in iounmap() argument Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a9f627c9df2b6a242cdc25d46f87191941cd0844 tree b4f3942e5ecc01574735003fa093c161691340be parent cfa7fd72ca03ac2324e8e469bd4b9ecc6f53394c author Al Viro Tue, 10 Oct 2006 22:46:27 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:22 -0700 [PATCH] ia64/sn __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cfa7fd72ca03ac2324e8e469bd4b9ecc6f53394c tree 7ffef9dcc2c2913082fa69450c48d2989008dc8e parent ba46df984b8e8114c3cf19c51670fab084bd4196 author Al Viro Tue, 10 Oct 2006 22:46:17 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:22 -0700 [PATCH] ia64/hp NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit ba46df984b8e8114c3cf19c51670fab084bd4196 tree ed41e3a2278dfc22bd7fda59e99d8c74af8f429d parent 28c4dadd3a7221f5b9cd5c7d03c499788b193353 author Al Viro Tue, 10 Oct 2006 22:46:07 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:22 -0700 [PATCH] __user annotations: futex Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 28c4dadd3a7221f5b9cd5c7d03c499788b193353 tree ace59f37f71eb757d5ec01003fb4ccdfe04f97dc parent 47b16539e1072afd2c964b97be4a95b5cf2ff801 author Al Viro Tue, 10 Oct 2006 22:45:57 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:21 -0700 [PATCH] tipc __user annotations Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 47b16539e1072afd2c964b97be4a95b5cf2ff801 tree 6acd1d1a667f5b724cdc5c95f0bbed2639a24b55 parent c714de5dcf41cee869c4a74e8783c6d9be459ef6 author Al Viro Tue, 10 Oct 2006 22:45:47 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:21 -0700 [PATCH] drivers/dma trivial annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c714de5dcf41cee869c4a74e8783c6d9be459ef6 tree 4fb2aa010c227e72e1dd39a58ef14290ebb24060 parent cb04e6b61985d7fafcb9529e5fcff4689f0961d3 author Al Viro Tue, 10 Oct 2006 22:45:37 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:21 -0700 [PATCH] devio __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit cb04e6b61985d7fafcb9529e5fcff4689f0961d3 tree fb4149b8984b84ccaba78255a95ccfaa6aa2e2f5 parent 04b1add1ab9121898b7d63570aad2a9c7ee9cfa3 author Al Viro Tue, 10 Oct 2006 22:45:27 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:21 -0700 [PATCH] hwdep_compat missed __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 04b1add1ab9121898b7d63570aad2a9c7ee9cfa3 tree 5b43c1a73f5169731f2bbee10b53834fe712e31f parent 98ae6ccd8e15aeac1c624615c044deecf46a359a author Al Viro Tue, 10 Oct 2006 22:45:17 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:21 -0700 [PATCH] misc sata __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 98ae6ccd8e15aeac1c624615c044deecf46a359a tree 206d1861baeb951e4a2994621afc3118d58f052d parent aa7677d40072a97a861390f0ed1a8c25ce312201 author Al Viro Tue, 10 Oct 2006 22:45:07 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:21 -0700 [PATCH] fix misannotations in loop.c Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit aa7677d40072a97a861390f0ed1a8c25ce312201 tree 1fde4cf2d870d3628c032d6b0671fc6595bc7d82 parent 48343273e846d2612b7977f2503fd97503996fa0 author Al Viro Tue, 10 Oct 2006 22:44:57 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:21 -0700 [PATCH] NULL noise removal: advansys Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 48343273e846d2612b7977f2503fd97503996fa0 tree 516ae31cd8b6e5676d8c11d309e98acb1d05f3b4 parent 1acc04cd4c0b54ada85d0dd5d7c5efc3441261bf author Al Viro Tue, 10 Oct 2006 22:44:47 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:20 -0700 [PATCH] __iomem annotations in sunzilog Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 1acc04cd4c0b54ada85d0dd5d7c5efc3441261bf tree 21c766ea954bcc4a0515fcee811661f47fcb821d parent 6aae8738473b7447284fe370d4e6816c02b4511b author Al Viro Tue, 10 Oct 2006 22:44:37 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:20 -0700 [PATCH] dccp __user annotations Signed-off-by: Al Viro Acked-by: David S. Miller Signed-off-by: Linus Torvalds commit 6aae8738473b7447284fe370d4e6816c02b4511b tree ec29350b79868de5e115c8f2e1e7b40317462cee parent 90cbad65911b5952a03111423347a6ab38236e0b author Al Viro Tue, 10 Oct 2006 22:44:27 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:20 -0700 [PATCH] drivers/s390 misc sparse annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 90cbad65911b5952a03111423347a6ab38236e0b tree e4f554ef5370694ae0a1ae4d88327ad4df5d0e62 parent 1e0dbafd30b2e1cd17fd141f4cfd633078524e8c author Al Viro Tue, 10 Oct 2006 22:44:17 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:20 -0700 [PATCH] more fs/compat.c __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1e0dbafd30b2e1cd17fd141f4cfd633078524e8c tree cc5f8ed885d89839944941fabb09fcbac73fe731 parent 2cbe19d48af198f0070470a2d836828de24fe163 author Al Viro Tue, 10 Oct 2006 22:44:07 +0100 committer Linus Torvalds Tue, 10 Oct 2006 15:37:20 -0700 [PATCH] advansys __iomem annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2cbe19d48af198f0070470a2d836828de24fe163 tree 4e6c27a49dc2aa5a4cf3c026b8cdcbfe9b15be72 parent 73fbe8be73512b8a3ffa3d20c9d7f531af99679c author Michael S. Tsirkin Mon, 09 Oct 2006 18:06:32 +0200 committer Roland Dreier Tue, 10 Oct 2006 12:50:38 -0700 IB/mthca: Fix off-by-one in mthca SRQ creation All HCAs (not just mem-free) need a spare SRQ entry, so bump srq->max by 1 in all cases. Noted by Jack Morgenstein Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 73fbe8be73512b8a3ffa3d20c9d7f531af99679c tree 71ae6cff83523e337d35f5ad294bc315f603c213 parent 1031bfb93adf641436b2192170525b76e2eb25bd author Roland Dreier Tue, 10 Oct 2006 12:50:38 -0700 committer Roland Dreier Tue, 10 Oct 2006 12:50:38 -0700 IPoIB: Check for DMA mapping error for TX packets Signed-off-by: Roland Dreier commit 1031bfb93adf641436b2192170525b76e2eb25bd tree 965c6b3c0ab9d78ecab72ff20b5dcde7b378555c parent 82a9c16a10521a0ceadbd27a549f6e8d5e70e0ab author Roland Dreier Tue, 10 Oct 2006 12:50:38 -0700 committer Roland Dreier Tue, 10 Oct 2006 12:50:38 -0700 RDMA/amso1100: Fix build with debugging off Since pr_debug() has changed from a macro to an inline function when DEBUG is not defined, its arguments now need to be defined even when debugging is off. Therefore to_event_str() and to_qp_state_str() need to be moved out of #ifdef DEBUG. The compiler will throw the definitions away if DEBUG is not defined, but it needs to be able to see that the functions exist. Signed-off-by: Roland Dreier commit 82a9c16a10521a0ceadbd27a549f6e8d5e70e0ab tree 317ca9b4ed1f378dd61cf644aa469e836f904c20 parent 8575329d4f8596519d86830f622d2c30601f3ef3 author Sean Hefty Wed, 04 Oct 2006 11:37:25 -0700 committer Roland Dreier Tue, 10 Oct 2006 12:50:38 -0700 IB/cm: Send DREP in response to unmatched DREQ Currently a DREP is only sent in response to a DREQ if a connection has been found matching the DREQ, and it is in the proper state. Once a DREP is sent, the local connection moves into timewait. Duplicate DREQs received while in this state result in re-sending the DREP. However, it's likely that the local connection will enter and exit timewait before the remote side times out a lost DREP and resends a DREQ. To handle this, we send a DREP in response to a DREQ, even if a local connection is not found. This avoids maintaining disconnected id's in timewait states for excessively long times, just to handle a lost DREP. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit 8575329d4f8596519d86830f622d2c30601f3ef3 tree 6fbcb5200d4bb863018fae5a07bfff9e16b9a976 parent a8bf4e7717142b0688a726dd07501a6a7783792a author Sean Hefty Wed, 04 Oct 2006 11:29:59 -0700 committer Roland Dreier Tue, 10 Oct 2006 12:50:38 -0700 IB/cm: Fix timewait crash after module unload If the ib_cm module is unloaded while id's are still in timewait, the CM will destroy the work queue used to process timewait. Once the id's exit timewait, their timers will fire, leading to a crash trying to access the destroyed work queue. We need to track id's that are in timewait, and cancel their deferred work on module unload. Signed-off-by: Sean Hefty Signed-off-by: Roland Dreier commit a8bf4e7717142b0688a726dd07501a6a7783792a tree 4e1219cd75c1dbd988827b4ed6877ea11b56f9f5 parent 01cb9bcbd34b7ba768a7f05375faf43becdb8a60 author Jack Morgenstein Wed, 04 Oct 2006 13:56:34 +0200 committer Roland Dreier Tue, 10 Oct 2006 12:50:36 -0700 IB/mthca: Query port fix Fill in "max_vl_num" (encoded according to VLCap field in the PortInfo MAD) and "init_type_reply" values in the ib_query_port() verb. Signed-off-by: Jack Morgenstein Signed-off-by: Roland Dreier commit 01cb9bcbd34b7ba768a7f05375faf43becdb8a60 tree 58eeaa0d602c3f858fced07e53ca4c44041c5a45 parent 9b0af401aae336975e620fccdd294bb763424f3f author Ishai Rabinovitz Wed, 04 Oct 2006 15:28:56 +0200 committer Roland Dreier Tue, 10 Oct 2006 12:49:05 -0700 IB/srp: Enable multiple connections to the same target Enable multiple concurrent connections to the same SRP target: 1) Use port GUID instead of node GUID in the initiator port identifier. This allows connections to be made from multiple HCA ports at the same time. 2) Let the user specify the identifier extention when adding the device. This allows userspace to make multiple connections even from the same port, if it wants too. Without this, only one connection can be made from any given HCA, even if it has multiple ports, because we don't use multi-channel mode, so targets will only allow one connection from a given initiator port ID. Signed-off-by: Ishai Rabinovitz Signed-off-by: Michael S. Tsirkin Signed-off-by: Roland Dreier commit 9b0af401aae336975e620fccdd294bb763424f3f tree b312e710814f647e2c730758c3aa6c252c589aa1 parent e52e6080ca10e0a8ce2a35c86965945cdfa8ed7e author Ishai Rabinovitz Tue, 10 Oct 2006 09:51:14 -0700 committer Roland Dreier Tue, 10 Oct 2006 09:51:14 -0700 IB/srp: Remove redundant memset() scsi_host_alloc() already allocates with kzalloc(), so the struct Scsi_Host is zeroed out, including the private data portion. Remove the redundant memset that zeros this out again in the SRP initiator. Signed-off-by: Ishai Rabinovitz Signed-off-by: Roland Dreier commit e52e6080ca10e0a8ce2a35c86965945cdfa8ed7e tree c76aa076673165e66d905e5271c8deca90329f68 parent ebf7a227dd1d810203a19642655d2fa293f395dd author Tom Tucker Tue, 03 Oct 2006 09:46:41 -0500 committer Roland Dreier Tue, 10 Oct 2006 09:51:13 -0700 RDMA/amso1100: Add spinlocks to serialize ib_post_send/ib_post_recv The AMSO driver was not thread-safe in the post WR code and had code that would sleep if the WR post FIFO was full. Since these functions can be called on interrupt level I changed the sleep to a udelay. Signed-off-by: Tom Tucker Signed-off-by: Roland Dreier commit 10270613fb4d5a44c335cfa13e9626bf5743c01d tree 6852db04a76e5a13c295f906c6f9acc88837a372 parent 9f2545c11869868fd3cde7098d99e690891e442c author Benjamin Herrenschmidt Tue, 10 Oct 2006 11:47:31 +1000 committer Paul Mackerras Tue, 10 Oct 2006 13:56:13 +1000 [POWERPC] Fix windfarm platform device usage The windfarm code uses a struct device_driver instead of platform_driver, which can cause crashes if any of the callbacks are called (like on module removal). This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 9f2545c11869868fd3cde7098d99e690891e442c tree e0e22ce8b9aaef7f29175a0841859c309c6090a7 parent d6a29252ad120457cd544d44b2fbea46a00734a7 author Benjamin Herrenschmidt Tue, 10 Oct 2006 11:45:45 +1000 committer Paul Mackerras Tue, 10 Oct 2006 13:56:13 +1000 [POWERPC] Fix i2c-powermac platform device usage i2c-powermac was written & merged right after Russell King's changes adding platform_driver... which I missed. Thus it still used struct device, causing crashes when hitting sleep/wakeup callbacks (it happened to work by luck so far, until early/late callbacks got added). This causes crashes on sleep/wakeup on PowerBooks with 2.6.19. The patch fixes it by using a proper platform_driver. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit d6a29252ad120457cd544d44b2fbea46a00734a7 tree 7dcc33d03f0e1caf48bc749060d78d80946099c4 parent 39e3eb7265b8698e5f607a317af13c9478274736 author Paul Mackerras Tue, 10 Oct 2006 13:51:00 +1000 committer Paul Mackerras Tue, 10 Oct 2006 13:51:00 +1000 [POWERPC] Fix secondary CPU startup on old "powersurge" SMP powermacs On the old "powersurge" SMP powermacs, the second CPU is started up by sending it an IPI, which has the side effect of stopping the timebase clock (so the secondary CPU's timebase can be synchronized with the primary's). The routine that did this used udelay, which will hang forever when the timebase is stopped, since udelay now spins until the timebase reaches a certain value. The end result is that the kernel would hang when bringing up the second CPU. This fixes it by using a simple loop which just does a fixed number of iterations to generate the delay. These old systems were all clocked at around 200 MHz or so, so a fixed number of iterations is acceptable. Signed-off-by: Paul Mackerras commit ebf7a227dd1d810203a19642655d2fa293f395dd tree 28b91319c3e792b79b405addd342288f43629a7e parent 1601ff0e29cfe112b06aa9bb2fb3519a1125baaa author Nick Piggin Tue, 10 Oct 2006 04:36:54 +0200 committer Linus Torvalds Mon, 09 Oct 2006 19:51:18 -0700 [PATCH] mm: bug in set_page_dirty_buffers This was triggered, but not the fault of, the dirty page accounting patches. Suitable for -stable as well, after it goes upstream. Unable to handle kernel NULL pointer dereference at virtual address 0000004c EIP is at _spin_lock+0x12/0x66 Call Trace: [<401766e7>] __set_page_dirty_buffers+0x15/0xc0 [<401401e7>] set_page_dirty+0x2c/0x51 [<40140db2>] set_page_dirty_balance+0xb/0x3b [<40145d29>] __do_fault+0x1d8/0x279 [<40147059>] __handle_mm_fault+0x125/0x951 [<401133f1>] do_page_fault+0x440/0x59f [<4034d0c1>] error_code+0x39/0x40 [<08048a33>] 0x8048a33 Signed-off-by: Nick Piggin Signed-off-by: Linus Torvalds commit 1601ff0e29cfe112b06aa9bb2fb3519a1125baaa tree c618296e804434eb185bdbd5ec45dd92eae2e74d parent d942492e1dbce264435daaf40f5742e1aaa5adaf parent 078830eaa8abccd1e95d3effce5b29273bb5ed09 author Linus Torvalds Mon, 09 Oct 2006 19:35:20 -0700 committer Linus Torvalds Mon, 09 Oct 2006 19:35:20 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SPARC32]: Fix prom.c build warning [SPARC64]: Update defconfig. [SPARC64]: Fix of_device bus_id settings. [SPARC64]: Update MAINTAINERS entry. commit 39e3eb7265b8698e5f607a317af13c9478274736 tree 927b34392c7d74b38d52749c2311f6dfe7285851 parent 8de242e60a441f177dd51b323894b17d3d63e9f2 author Al Viro Mon, 09 Oct 2006 12:48:42 +0100 committer Paul Mackerras Tue, 10 Oct 2006 11:55:25 +1000 [POWERPC] ARCH=ppc pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Paul Mackerras commit d942492e1dbce264435daaf40f5742e1aaa5adaf tree a45e29a47e2310dfbe2dfb0a966fbd5120ff1b7e parent e04582b7bc70b40c57287cdc24f81964ee88f565 parent b0ac3f50b8f2cd992ffd36d22c82eabdf075e9c4 author Linus Torvalds Mon, 09 Oct 2006 18:55:00 -0700 committer Linus Torvalds Mon, 09 Oct 2006 18:55:00 -0700 Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/configh * master.kernel.org:/pub/scm/linux/kernel/git/davej/configh: [HEADERS] Put linux/config.h out of its misery. commit 8de242e60a441f177dd51b323894b17d3d63e9f2 tree 252ea4d7c90181f91dbc252405259b1ed4359d34 parent 1e1b20a119ac45a290bbc6261f69a2a6a2cc064a author Benjamin Herrenschmidt Mon, 09 Oct 2006 13:28:59 +1000 committer Paul Mackerras Tue, 10 Oct 2006 11:54:26 +1000 [POWERPC] Update maple defconfig This updates the Maple defconfig to 4 CPUs (along with current defaults) to support the "tigerwood" 970MP evaluation board. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 1e1b20a119ac45a290bbc6261f69a2a6a2cc064a tree 22cdf1c819a7b7fb2e475166b83682d9853a054d parent c10af8c38da7a0bc9010d6609237c1ab6d2da12c author Benjamin Herrenschmidt Mon, 09 Oct 2006 13:27:28 +1000 committer Paul Mackerras Tue, 10 Oct 2006 11:54:26 +1000 [POWERPC] Fix Maple secondary IDE interrupt The IDE driver will pick up the PCI IRQ for both channels on Maple despite the fact that it's in legacy mode. This works around it by "hiding" the PCI IRQ of the AMD8111 IDE controller when it's configured in legacy mode on the Maple platform, thus causing the driver to call pci_get_legacy_ide_irq() which will return the correct interrupts for both channels. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c10af8c38da7a0bc9010d6609237c1ab6d2da12c tree 49db04ebb078752d4593c7fc6c2f247fbd4cbcb3 parent 020533ef24309803789ab8b325b1a6463388decf author Benjamin Herrenschmidt Mon, 09 Oct 2006 13:25:15 +1000 committer Paul Mackerras Tue, 10 Oct 2006 11:54:26 +1000 [POWERPC] Make U4 PCIe work on maple The Maple support code was missing code for U4/CPC945 PCIe. This adds it, enabling it to work on tigerwood boards, and possibly also js21 using SLOF. Also disable an obsolete firmware workaround. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 020533ef24309803789ab8b325b1a6463388decf tree e0272e751bf8f332f017d9d2afb6b13593742240 parent dcf9065122660f4e3df02a47a75dc702d5531244 author Geoff Levand Sat, 07 Oct 2006 15:33:53 -0700 committer Paul Mackerras Tue, 10 Oct 2006 11:54:26 +1000 [POWERPC] cell: fix default zImage build target Change CONFIG_PPC_CELL to CONFIG_PPC_IBM_CELL_BLADE in the powerpc boot makefile. CONFIG_PPC_CELL is used to build the generic cell processor support, and is not an indication of platform. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit dcf9065122660f4e3df02a47a75dc702d5531244 tree 118700d73267535579d128becdfd840dfdfd1238 parent f583ffce1aac783fd16d5d75cd69ac5ebb8f4933 author Michael Ellerman Sat, 30 Sep 2006 11:54:09 +1000 committer Paul Mackerras Tue, 10 Oct 2006 11:54:26 +1000 [POWERPC] Fix boot wrapper invocation if CROSS_COMPILE contains spaces My CROSS_COMPILE is "ccache /opt/compilers/blah", which confuses the boot wrapper script. Quote CROSS_COMPILE and CROSS32_COMPILE so they can safely contain spaces. Signed-off-by: Michael Ellerman Signed-off-by: Paul Mackerras commit f583ffce1aac783fd16d5d75cd69ac5ebb8f4933 tree 4123e8827592ab83191c56bc331dc73c3e42c0a9 parent 81e859ac1eef300c1b2ff49a2f2da8ee4ce1e844 author Paul Mackerras Tue, 10 Oct 2006 11:47:07 +1000 committer Paul Mackerras Tue, 10 Oct 2006 11:47:07 +1000 [POWERPC] Fix xmon IRQ handler for pt_regs removal Signed-off-by: Paul Mackerras commit 078830eaa8abccd1e95d3effce5b29273bb5ed09 tree 500cb8fdfef241f81594cbf0b2eb64209cb6e280 parent 79bf06248b69b937f3a917281b4a8520a66c7582 author Martin Habets Mon, 09 Oct 2006 18:10:16 -0700 committer David S. Miller Mon, 09 Oct 2006 18:10:16 -0700 [SPARC32]: Fix prom.c build warning Fix these 2.6.19-rc1 build warnings: CC arch/sparc/kernel/prom.o arch/sparc/kernel/prom.c: In function `of_set_property': arch/sparc/kernel/prom.c:246: warning: passing arg 2 of `prom_setprop' discards qualifiers from pointer target type arch/sparc/kernel/prom.c: In function `build_one_prop': arch/sparc/kernel/prom.c:446: warning: unused variable `len' arch/sparc/kernel/prom.c:480: warning: ignoring return value of `prom_getproperty', declared with attribute warn_unused_result Signed-off-by: Martin Habets Signed-off-by: David S. Miller commit 79bf06248b69b937f3a917281b4a8520a66c7582 tree 98e099baf8d18d4e1bec5e1e210037e7c6a43030 parent 4b75eb2bd30707c1af76145fd3a4ec2d890e1870 author David S. Miller Thu, 05 Oct 2006 02:08:59 -0700 committer David S. Miller Mon, 09 Oct 2006 17:24:53 -0700 [SPARC64]: Update defconfig. Signed-off-by: David S. Miller commit 4b75eb2bd30707c1af76145fd3a4ec2d890e1870 tree 8297f3968f759788a8cb2e385dfb6e24ae18a6c4 parent 99ae1c83b5107cd91e45d4d3c7bf096cdff0cf06 author David S. Miller Thu, 05 Oct 2006 02:07:32 -0700 committer David S. Miller Mon, 09 Oct 2006 17:24:52 -0700 [SPARC64]: Fix of_device bus_id settings. They have to be unique system-wide, so use "NAME@NODE" as the string pattern of the non-root nodes. Thanks to Andrew Morton for fixing the error value checking in bus_add_device() which made this problem finally noticable. Signed-off-by: David S. Miller commit 99ae1c83b5107cd91e45d4d3c7bf096cdff0cf06 tree 8510c135230caa1878d784c945dbb61f87eb5bd0 parent 81e859ac1eef300c1b2ff49a2f2da8ee4ce1e844 author David S. Miller Wed, 04 Oct 2006 17:31:00 -0700 committer David S. Miller Mon, 09 Oct 2006 17:24:51 -0700 [SPARC64]: Update MAINTAINERS entry. ultralinux@vger is deprecated, folks should use sparclinux@vger for both sparc ports. Eddie, Anton, and Jakub haven't been active in sparc64 maintainence for years, so best to remove them as reports do nothing more than fill up their mailboxes :) Signed-off-by: David S. Miller commit b0ac3f50b8f2cd992ffd36d22c82eabdf075e9c4 tree 8f9165fc31c531477f64731b11fd53128e171322 parent 81e859ac1eef300c1b2ff49a2f2da8ee4ce1e844 author Dave Jones Mon, 09 Oct 2006 19:13:51 -0400 committer Dave Jones Mon, 09 Oct 2006 19:13:51 -0400 [HEADERS] Put linux/config.h out of its misery. Signed-off-by: Dave Jones commit e04582b7bc70b40c57287cdc24f81964ee88f565 tree a5127c2d4165e656a84612836f6326427843acca parent f5c70dd7f384db4c524c35288d9be3ed61ac41a9 author Atsushi Nemoto Mon, 09 Oct 2006 00:10:01 +0900 committer Ralf Baechle Mon, 09 Oct 2006 23:20:48 +0100 [MIPS] Make sure cpu_has_fpu is used only in atomic context Make sure cpu_has_fpu (which uses smp_processor_id()) is used only in atomic context. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit f5c70dd7f384db4c524c35288d9be3ed61ac41a9 tree 1307e583bbbfa067422dc803f4de775a9c9bfb25 parent 5536b2351425136e629bd9fc18135c6e21e125c2 author Atsushi Nemoto Sun, 20 Aug 2006 22:55:52 +0900 committer Ralf Baechle Mon, 09 Oct 2006 23:20:48 +0100 [MIPS] Fix build errors related to wbflush.h on tx4927/tx4938. TX49 CPUs have a SYNC instruction so that CONFIG_CPU_HAS_WB is no longer needed. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 5536b2351425136e629bd9fc18135c6e21e125c2 tree 219907a6d61c8daad068efd54e2ccd59462ff2b9 parent 0118c3ca9e7518b06a10e9d7f4bd15957df45783 author Ralf Baechle Mon, 09 Oct 2006 16:34:41 +0100 committer Ralf Baechle Mon, 09 Oct 2006 23:20:47 +0100 [MIPS] Alchemy: nuke usbdev; it's useless as is ... Signed-off-by: Ralf Baechle commit 0118c3ca9e7518b06a10e9d7f4bd15957df45783 tree 1bdbcaec734df15635d12570c01cb63233e61fd6 parent 12a0a703b3f07e5b01c81fe4f5d2a221c9318f16 author Ralf Baechle Mon, 05 Jun 2006 11:54:41 +0100 committer Ralf Baechle Mon, 09 Oct 2006 23:20:47 +0100 [MIPS] Malta: Fix build for non-MIPS32/64 configuration. Signed-off-by: Ralf Baechle commit 12a0a703b3f07e5b01c81fe4f5d2a221c9318f16 tree 5ea057098503af8b400bc5404d391cc2c5724799 parent 0e8f8f54c1537d22eb0168622a5f6aef4040da6a author Ralf Baechle Mon, 09 Oct 2006 23:20:47 +0100 committer Ralf Baechle Mon, 09 Oct 2006 23:20:47 +0100 [RTC] Consistently use of tabs for formatting. commit 0e8f8f54c1537d22eb0168622a5f6aef4040da6a tree 47c636803f431d35fcfc77979b3331ac6e6d0943 parent 18965513fdc3af976f000f231ee216500d707c11 author Ralf Baechle Sat, 08 Jul 2006 01:07:40 +0200 committer Ralf Baechle Mon, 09 Oct 2006 23:20:46 +0100 [MIPS] NUMA: Register all nodes before cpus or sysfs will barf. Signed-off-by: Ralf Baechle commit 18965513fdc3af976f000f231ee216500d707c11 tree 8813d7edf7dfff641c819ff681a57df174c83c47 parent f431baa55abf8adeed0c718b51deacbc151f58f1 author Ralf Baechle Mon, 09 Oct 2006 23:20:46 +0100 committer Ralf Baechle Mon, 09 Oct 2006 23:20:46 +0100 [MIPS] qtronix: remove driver. Another leftover of removing support for the ITE8172. Signed-off-by: Ralf Baechle commit f431baa55abf8adeed0c718b51deacbc151f58f1 tree fe0383328c1d8bcb0fae7e266a437b980a05a7f9 parent 441ee341ad63572f39cb8074e31806b5b1471d0b author Atsushi Nemoto Mon, 09 Oct 2006 01:24:23 +0900 committer Ralf Baechle Mon, 09 Oct 2006 23:20:46 +0100 [MIPS] ret_from_irq adjustment Make sure that RA on top of interrupt stack is an address of ret_from_irq, so that dump_stack etc. can trace info interrupted context. Also this patch fixes except_vec_vi_handler and __smtc_ipi_vector which seems broken. Signed-off-by: Atsushi Nemoto Signed-off-by: Ralf Baechle commit 441ee341ad63572f39cb8074e31806b5b1471d0b tree 66da0692f385f8b29982847f01c10215333d0e85 parent 81e859ac1eef300c1b2ff49a2f2da8ee4ce1e844 author Ralf Baechle Fri, 02 Jun 2006 11:48:11 +0100 committer Ralf Baechle Mon, 09 Oct 2006 23:20:45 +0100 [MIPS] Fix RM9000 wait instruction detection. Only revisions < 4.0 don't have a functional wait instruction. From Thomas Koeller (Thomas.Koeller@baslerweb.com). Signed-off-by: Ralf Baechle commit 81e859ac1eef300c1b2ff49a2f2da8ee4ce1e844 tree 58adeba722120499ed6aa428bb4b321d69902727 parent ea62aa1b6f6d31b53a34a6f5271ed85735ccc0bc author Geert Uytterhoeven Mon, 09 Oct 2006 22:27:42 +0200 committer Linus Torvalds Mon, 09 Oct 2006 14:54:46 -0700 [PATCH] m68k/MVME167: SERIAL167 tty flip buffer updates Compile fixes related to changed tty flip buffer handling. Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit ea62aa1b6f6d31b53a34a6f5271ed85735ccc0bc tree 79d91c8a1711e03e83cf8cc2316f8d7765f07958 parent 2ed0ce5b57950a620155433c62a5a02a067f1376 author Geert Uytterhoeven Mon, 09 Oct 2006 22:27:42 +0200 committer Linus Torvalds Mon, 09 Oct 2006 14:54:46 -0700 [PATCH] m68k/MVME167: SERIAL167 is no longer broken - SERIAL167 is no longer broken - Removed some unused variables from the driver to fix compiler warnings Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 2ed0ce5b57950a620155433c62a5a02a067f1376 tree d30b3c952a507abfbe19ba4bc7086b7eab9d99ce parent 69961c375288bdab7604e0bb1c8d22999bb8a347 author Geert Uytterhoeven Mon, 09 Oct 2006 22:23:56 +0200 committer Linus Torvalds Mon, 09 Oct 2006 14:54:46 -0700 [PATCH] m68k/Apollo: Remove obsolete arch/m68k/apollo/dma.c Remove unused arch/m68k/apollo/dma.c, which was obsoleted by the move to the generic DMA API. Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 69961c375288bdab7604e0bb1c8d22999bb8a347 tree 869e81d9798a8b41e7e9b35a992fe5794e9f28aa parent da96d0b58adddf3bdeaa9644ac74f0dcc9039407 author Geert Uytterhoeven Mon, 09 Oct 2006 22:23:31 +0200 committer Linus Torvalds Mon, 09 Oct 2006 14:54:46 -0700 [PATCH] m68k/Atari: Interrupt updates Misc Atari fixes: - initialize correct number of atari irqs - silence vbl interrupt until it's used by atafb - use mdelay() to read clock if necessary Signed-off-by: Roman Zippel Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit da96d0b58adddf3bdeaa9644ac74f0dcc9039407 tree 47fe66ac09941370dfcc157ef3525f63c9212f06 parent 6fb8296aa1681e74b2aa3c59169d9014e6a0dfc3 author Geert Uytterhoeven Mon, 09 Oct 2006 22:22:37 +0200 committer Linus Torvalds Mon, 09 Oct 2006 14:54:45 -0700 [PATCH] m68k/HP300: Enable HIL configuration options Enable HIL configuration options on HP300 Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 6fb8296aa1681e74b2aa3c59169d9014e6a0dfc3 tree 515011e8823c4de5d14be81f8d76f8d06041538c parent 6aabd6af4aaf6d794f67226934ad731eb1765e5d author Geert Uytterhoeven Mon, 09 Oct 2006 22:02:31 +0200 committer Linus Torvalds Mon, 09 Oct 2006 14:53:35 -0700 [PATCH] m68k: more syscall updates Add missing syscalls Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit 6aabd6af4aaf6d794f67226934ad731eb1765e5d tree 374d9271a2ba17f6cf3557a75792821431aed15a parent d3696cf7370583b272ff2f09524c9d37a83c71b2 author Geert Uytterhoeven Mon, 09 Oct 2006 22:02:25 +0200 committer Linus Torvalds Mon, 09 Oct 2006 14:53:35 -0700 [PATCH] m68k: syscall updates Add some missing system calls (recent udev needs them) Signed-off-by: Kars de Jong Signed-off-by: Geert Uytterhoeven Signed-off-by: Linus Torvalds commit d3696cf7370583b272ff2f09524c9d37a83c71b2 tree 85678034e69eebebaccfb50130a864133ab357a3 parent 9b6d99f48dfc27d6009e134a5d771eaefd75faac author Eric W. Biederman Sun, 08 Oct 2006 23:41:59 -0600 committer Linus Torvalds Mon, 09 Oct 2006 14:51:43 -0700 [PATCH] x86_64 irq: Scream but don't die if we receive an unexpected irq Due to code bugs or misbehaving hardware it is possible that we can receive an interrupt that we have not mapped into a linux irq. Calling BUG when that happens is very rude, and if the problem is mild enough prevents anything else from getting done. So instead of calling BUG just scream loudly about the problem and continue running. We don't have enough knowledge to know which interrupt triggered this behavior so we don't acknowledge it. This will likely prevent a recurrence of the problem by jamming up the works with an unacknowledged interrupt. If the interrupt was something important it is quite possible that nothing productive will happen past this point. But it is now at least possible to keep working if the kernel can survive without the interrupt we dropped on the floor. Solutions like irqpoll should generally make dropped irqs non-fatal. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 9b6d99f48dfc27d6009e134a5d771eaefd75faac tree 5131841a5df84ad9564dad19f11f9d1a0e0085bb parent 5a43c09d1b65da614620b1985633e3251b4f9b99 parent 40220c1a192f51695f806d75b1f9970f0f17a6e8 author Linus Torvalds Mon, 09 Oct 2006 14:29:26 -0700 committer Linus Torvalds Mon, 09 Oct 2006 14:29:26 -0700 Merge git://git.infradead.org/~dhowells/irq-2.6 * git://git.infradead.org/~dhowells/irq-2.6: IRQ: Use the new typedef for interrupt handler function pointers commit 5a43c09d1b65da614620b1985633e3251b4f9b99 tree 3ecbd9dbec12cd023030baa0b1919498fe4e03c9 parent 659564c8adfe1765476beee8d55cd18986946892 parent 5d347c8abaab1e8c24272a53099c22482855783e author Linus Torvalds Mon, 09 Oct 2006 14:21:45 -0700 committer Linus Torvalds Mon, 09 Oct 2006 14:21:45 -0700 Merge branch 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6 * 'irqclean-submit1' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/misc-2.6: drivers/isdn/act2000: kill irq2card_map drivers/net/eepro: kill dead code Various drivers' irq handlers: kill dead code, needless casts drivers/net: eliminate irq handler impossible checks, needless casts arch/i386/kernel/time: don't shadow 'irq' function arg commit 659564c8adfe1765476beee8d55cd18986946892 tree 8ddef1e06257449b4ca6ca83fc80867771a6f5a4 parent e069d79d23739977800c3b8495853b735f77ef30 author Bill Nottingham Mon, 09 Oct 2006 16:10:48 -0400 committer Linus Torvalds Mon, 09 Oct 2006 14:20:38 -0700 [PATCH] Introduce vfs_listxattr This patch moves code out of fs/xattr.c:listxattr into a new function - vfs_listxattr. The code for vfs_listxattr was originally submitted by Bill Nottingham to Unionfs. Sorry about that. The reason for this submission is to make the listxattr code in fs/xattr.c a little cleaner (as well as to clean up some code in Unionfs.) Currently, Unionfs has vfs_listxattr defined in its code. I think that's very ugly, and I'd like to see it (re)moved. The logical place to put it, is along side of all the other vfs_*xattr functions. Overall, I think this patch is benefitial for both kernel.org kernel and Unionfs. Signed-off-by: Josef "Jeff" Sipek Acked-by: Al Viro Signed-off-by: Linus Torvalds commit e069d79d23739977800c3b8495853b735f77ef30 tree 733f8fea5da0501df560da5e757b4e3c4600ec1e parent 97c4965d970587a1cc4264c1cffbf0ea9c1e35e8 author Al Viro Mon, 09 Oct 2006 20:29:43 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:08 -0700 [PATCH] tifm __iomem annotations, NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 97c4965d970587a1cc4264c1cffbf0ea9c1e35e8 tree f366774b6f960281ba953b5f82544c1d012c68b6 parent 5a42b81f03b756116f982e72838bc358bc4e460f author Al Viro Mon, 09 Oct 2006 20:29:03 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:08 -0700 [PATCH] mos7840 annotations __user annotations, NULL noise removal, %p use for pointers Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5a42b81f03b756116f982e72838bc358bc4e460f tree 023dfdd518fa589f9d16c83116ea9f17ee59cef7 parent c8adf94a4806b4ae49a3057d434471a0b01096e3 author Al Viro Mon, 09 Oct 2006 20:28:03 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:08 -0700 [PATCH] s390 traps.c __user annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit c8adf94a4806b4ae49a3057d434471a0b01096e3 tree 481f6c0fda96d0fa84064abfb12887f6be2f4479 parent 38d6fd26ea7f291141039fe340a581dc6f770fc0 author Al Viro Mon, 09 Oct 2006 20:26:58 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:08 -0700 [PATCH] hppfs: readdir callback missed in prototype change Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 38d6fd26ea7f291141039fe340a581dc6f770fc0 tree 3e8ef8ea8e72fab24c140be53b18c98f2cb6cc95 parent 5c09d96b34ac9b95ab4606e51ddb34ed0f19faf1 author Al Viro Mon, 09 Oct 2006 20:27:30 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:08 -0700 [PATCH] dlm gfp_t annotations Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5c09d96b34ac9b95ab4606e51ddb34ed0f19faf1 tree 026980baf553bc734df125d1fb0aaafcad5c07ae parent 8dc42f9e037e5fb7b01c1334b7752b9355f5293a author Al Viro Mon, 09 Oct 2006 20:24:49 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:08 -0700 [PATCH] wrong order of arguments in copy_to_user() in ncpfs Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8dc42f9e037e5fb7b01c1334b7752b9355f5293a tree f7c91a353088a1c79dd06b957b89c163256913a4 parent 7c84ace9bcd90e38ebf88b304a8ed4fed7ff3574 author Al Viro Mon, 09 Oct 2006 16:26:47 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:08 -0700 [PATCH] mv64630_pic NULL noise removal Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7c84ace9bcd90e38ebf88b304a8ed4fed7ff3574 tree 3a05ba9b384112546c96c080a8e3c6a594b87509 parent f3d2ab41b5e2dfb2fc8679b786476327cea2f249 author Al Viro Mon, 09 Oct 2006 16:23:09 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:08 -0700 [PATCH] trivial iomem annotations (arch/powerpc/platfroms/parsemi/pci.c) Signed-off-by: Al Viro Acked-by: Olof Johansson Signed-off-by: Linus Torvalds commit f3d2ab41b5e2dfb2fc8679b786476327cea2f249 tree 6fc55b0473af9ee0dcce2abc5ed039c0730293cd parent a23b7cb998f18101f9b0f505d81e6c68a7830a05 author Al Viro Mon, 09 Oct 2006 16:22:09 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:07 -0700 [PATCH] extern doesn't make sense on a definition of function... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a23b7cb998f18101f9b0f505d81e6c68a7830a05 tree 420da4aac3bda17126befeeb34301e5166c63296 parent 041a6baec5a9260ad8b71c43a7ea1de95dfa974c author Al Viro Mon, 09 Oct 2006 12:47:31 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:07 -0700 [PATCH] more ia64 irq handlers Cast to (void *) in request_irq() argument is stupid and only hides problems... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 041a6baec5a9260ad8b71c43a7ea1de95dfa974c tree 9486b07c91bec174aa431aa669f96fbe68f3a6d1 parent 63540ba3691600759c6732f800dcf0fe8075960b author Al Viro Mon, 09 Oct 2006 12:46:52 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:07 -0700 [PATCH] fallout from alpha pt_regs patches missed irq handler in sys_titan and forgotten prototype update. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 63540ba3691600759c6732f800dcf0fe8075960b tree cf1930a35d70faa80498474480fc555f8728d8fe parent 58ba81dba77eab43633ea47d82e96245ae3ff666 author Al Viro Mon, 09 Oct 2006 11:51:14 +0100 committer Linus Torvalds Mon, 09 Oct 2006 14:19:07 -0700 [PATCH] sparc64 irq pt_regs fallout Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 40220c1a192f51695f806d75b1f9970f0f17a6e8 tree 86623a8c361420c22c6511b20770057fd9c9881d parent 58ba81dba77eab43633ea47d82e96245ae3ff666 author David Howells Mon, 09 Oct 2006 12:19:47 +0100 committer David Howells Mon, 09 Oct 2006 12:19:47 +0100 IRQ: Use the new typedef for interrupt handler function pointers Use the new typedef for interrupt handler function pointers rather than actually spelling out the full thing each time. This was scripted with the following small shell script: #!/bin/sh egrep -nHrl -e 'irqreturn_t[ ]*[(][*]' $* | while read i do echo $i perl -pi -e 's/irqreturn_t\s*[(]\s*[*]\s*([_a-zA-Z0-9]*)\s*[)]\s*[(]\s*int\s*,\s*void\s*[*]\s*[)]/irq_handler_t \1/g' $i || exit $? done Signed-Off-By: David Howells commit 58ba81dba77eab43633ea47d82e96245ae3ff666 tree 4bdb3972b466b604c13407b2b32226259304bf53 parent 1622605cf6e15bfdc55a3dc78b792018edded435 author Al Viro Mon, 09 Oct 2006 02:11:47 +0100 committer Linus Torvalds Sun, 08 Oct 2006 18:50:58 -0700 [PATCH] m68k/kernel/dma.c assumes !MMU_SUN3 Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 1622605cf6e15bfdc55a3dc78b792018edded435 tree c9ff2827d1f6f91501d9f5a05a71c8a3963f1455 parent 832504933757ba7913bf64cd574326e014215b41 author Al Viro Mon, 09 Oct 2006 02:09:49 +0100 committer Linus Torvalds Sun, 08 Oct 2006 18:50:58 -0700 [PATCH] arm: it's OK to pass pointer to volatile as iounmap() argument... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 832504933757ba7913bf64cd574326e014215b41 tree 8ee42f0cd79d605ea13f6d81a1ab38cb3473a6f4 parent 61ce7b3ab55e6dd3a9811d0cf4f2dc5a3a5d892a author Linus Torvalds Sun, 08 Oct 2006 17:28:25 -0700 committer Linus Torvalds Sun, 08 Oct 2006 17:28:25 -0700 Fix extraneous '&' in recent NFS client cleanup We should pass "wait_event_interruptible()" the wait-queue itself, not the pointer to it. The magic macro will pointerize it internally. Signed-off-by: Linus Torvalds commit 61ce7b3ab55e6dd3a9811d0cf4f2dc5a3a5d892a tree bc1dd3b052f28ac40c2cedbbe251b70ced303644 parent 7bea96fd22a8fd19f90817405b4abe032317a0e3 parent 27f768192fe2d96936cef5d4713e228daee07ae2 author Linus Torvalds Sun, 08 Oct 2006 16:42:11 -0700 committer Linus Torvalds Sun, 08 Oct 2006 16:42:11 -0700 Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus * 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus: [MIPS] Cleanup unnecessary inclusions. [MIPS] DEC: pt_regs fixes for buserror handlers [MIPS] Fix return type of gt64120_irq. [MIPS] Ocelot C: Build fix - ll_mv64340_irq takes no more regs argument. [MIPS] Jazz defconfig file. [MIPS] Jazz: build fix - include [MIPS] Jazz: Remove warning. After 7 years probably somebody test this ;) [MIPS] Jazz: Fix I/O port resources. [MIPS] DEC: pt_regs fixes for dec_intr_halt. handle_sysrq lost its pt_regs * argument Manual conflict resolved in arch/um/drivers/mconsole_kern.c commit 7bea96fd22a8fd19f90817405b4abe032317a0e3 tree 518bbc228f61f8ff393e4f9a57eeaab8aa2ea2df parent e24bb60e11e3fe9858b71874a4ac59333adbc4fc author Al Viro Sun, 08 Oct 2006 22:49:34 +0100 committer Linus Torvalds Sun, 08 Oct 2006 16:34:08 -0700 [PATCH] uml pt_regs fixes Real fix for UML pt_regs stuff. Note set_irq_regs() logics in there... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 27f768192fe2d96936cef5d4713e228daee07ae2 tree f28e72704595649011e6736945a1fd69457ce2fc parent 6dab2f4564b3dc8747452e256fb779f320ff5650 author Ralf Baechle Mon, 09 Oct 2006 00:03:05 +0100 committer Ralf Baechle Mon, 09 Oct 2006 00:15:28 +0100 [MIPS] Cleanup unnecessary inclusions. Signed-off-by: Ralf Baechle commit 6dab2f4564b3dc8747452e256fb779f320ff5650 tree ecde52d0bd23beaca6404bb3cfa29af3ebbb5b2d parent 65542070de7d6cd307657a71ab1712a6c58c0889 author Ralf Baechle Mon, 09 Oct 2006 00:00:31 +0100 committer Ralf Baechle Mon, 09 Oct 2006 00:15:28 +0100 [MIPS] DEC: pt_regs fixes for buserror handlers Signed-off-by: Ralf Baechle commit 65542070de7d6cd307657a71ab1712a6c58c0889 tree 232a1bee8fd8548f07be62c0bab34c3d9c7ed6fd parent d864b96bb08f88d000cf8f78b5bac93fe631d0f5 author Ralf Baechle Sun, 08 Oct 2006 23:56:13 +0100 committer Ralf Baechle Mon, 09 Oct 2006 00:15:28 +0100 [MIPS] Fix return type of gt64120_irq. Signed-off-by: Ralf Baechle commit d864b96bb08f88d000cf8f78b5bac93fe631d0f5 tree 97a31a9caf6b33c0ecf676a2c37633b56a3b63ec parent de4f742b96f286ac20c04dd9c53897a05b412843 author Ralf Baechle Sun, 08 Oct 2006 21:32:40 +0100 committer Ralf Baechle Mon, 09 Oct 2006 00:15:27 +0100 [MIPS] Ocelot C: Build fix - ll_mv64340_irq takes no more regs argument. Signed-off-by: Ralf Baechle commit de4f742b96f286ac20c04dd9c53897a05b412843 tree c7cbc55085a78d0e8b342d743f8154ba1b72d6ab parent 06e80113c765119e73394a5878c137f2d09a4dcd author Ralf Baechle Sun, 08 Oct 2006 20:50:12 +0100 committer Ralf Baechle Mon, 09 Oct 2006 00:15:27 +0100 [MIPS] Jazz defconfig file. Signed-off-by: Ralf Baechle commit 06e80113c765119e73394a5878c137f2d09a4dcd tree ef6ccccc8a97b66dde7b07dea8f581644f3c3bdc parent 3bdcdd681b64fa92934039ff0d217414720a4b1e author Ralf Baechle Sun, 08 Oct 2006 19:35:00 +0100 committer Ralf Baechle Mon, 09 Oct 2006 00:15:27 +0100 [MIPS] Jazz: build fix - include Signed-off-by: Ralf Baechle commit 3bdcdd681b64fa92934039ff0d217414720a4b1e tree 4edbdd8adc4daa1f58cb8bd7d2d8d3b23fa40fdc parent 2cf69e765a99baacf0121f3312ec84ff1031961d author Ralf Baechle Sun, 08 Oct 2006 19:28:44 +0100 committer Ralf Baechle Mon, 09 Oct 2006 00:15:27 +0100 [MIPS] Jazz: Remove warning. After 7 years probably somebody test this ;) Signed-off-by: Ralf Baechle commit 2cf69e765a99baacf0121f3312ec84ff1031961d tree 071c8d6a109958002a329638452053b33a8ce4b6 parent d62801e961e148313910ec430e230e488fadc196 author Ralf Baechle Sun, 08 Oct 2006 19:19:11 +0100 committer Ralf Baechle Mon, 09 Oct 2006 00:15:27 +0100 [MIPS] Jazz: Fix I/O port resources. struct resource members were shuffeled a while ago. Signed-off-by: Ralf Baechle commit d62801e961e148313910ec430e230e488fadc196 tree 34465d16df47307f69b79c36c998592127fad6b3 parent b104189c203a47219e51ab179e50fd0c73ccea3b author Ralf Baechle Sun, 08 Oct 2006 17:38:18 +0100 committer Ralf Baechle Mon, 09 Oct 2006 00:15:27 +0100 [MIPS] DEC: pt_regs fixes for dec_intr_halt. Signed-off-by: Ralf Baechle commit b104189c203a47219e51ab179e50fd0c73ccea3b tree 37025eb149191f2694cd904264087bf3074772d3 parent e24bb60e11e3fe9858b71874a4ac59333adbc4fc author Ralf Baechle Mon, 09 Oct 2006 00:15:27 +0100 committer Ralf Baechle Mon, 09 Oct 2006 00:15:27 +0100 handle_sysrq lost its pt_regs * argument Signed-off-by: Ralf Baechle commit e24bb60e11e3fe9858b71874a4ac59333adbc4fc tree 948763fe4c7c173e0b5ac6fa1452c8a55c47bb38 parent 0bae89ec8b1519dae67036637942f5b5bbaa9424 author Linus Torvalds Sun, 08 Oct 2006 15:38:22 -0700 committer Linus Torvalds Sun, 08 Oct 2006 15:38:22 -0700 Revert "[POWERPC] Don't get PCI IRQ from OF for devices with no IRQ" This reverts commit 41550c5128150175197257b6ceab2cd50dea7b51. Quoth Ben Herrenschmidt: "Please revert this one for now. It seems to break G5s :( Looks like PCI cells inside Apple IO ASICs don't have a PCI_INTERRUPT_LINE set. I need to figure out a better fix." Signed-off-by: Linus Torvalds commit 0bae89ec8b1519dae67036637942f5b5bbaa9424 tree 12a37ef553a394f6794af74fa5d46a74350fc02b parent cb1055fb1b79775d398038ad8dcd2c7581f141d8 author Trond Myklebust Sun, 08 Oct 2006 14:33:24 -0400 committer Linus Torvalds Sun, 08 Oct 2006 15:34:56 -0700 [PATCH] NFS: Fix typo in nfs_get_client() Commit ca4aa09635516258f158a7bc1594a794e4c34864 fixed waiting for the structure to get initialised, but it is also possible to break out of the loop while still in TASK_INTERRUPTIBLE. Replace the whole thing by wait_event_interruptible, which is much more readable, and doesn't suffer from these problems. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit cb1055fb1b79775d398038ad8dcd2c7581f141d8 tree 0e71da0114d4d428f6362d3a77ba1f54393d0ff8 parent 9288d1a3c7ed0abaa7976844e5d42bbd4fa0eae3 author Al Viro Sun, 08 Oct 2006 15:08:45 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:36 -0700 [PATCH] linux/io.h needs types.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9288d1a3c7ed0abaa7976844e5d42bbd4fa0eae3 tree 8fb12a98e87630631b61c8d65afe94327e61848e parent a8f47c45aee6efa5ef7ec209b90681b091bd3d2c author Al Viro Sun, 08 Oct 2006 15:05:14 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:36 -0700 [PATCH] missing forward declaration of pt_regs (asm-m68k/signal.h) Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit a8f47c45aee6efa5ef7ec209b90681b091bd3d2c tree ad2e7ed7af931987b8c39b18d8a7535125039caa parent 97432886617825d412bcedadf5e5b308f931caad author Al Viro Sun, 08 Oct 2006 15:04:15 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:36 -0700 [PATCH] missing include of scatterlist.h Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 97432886617825d412bcedadf5e5b308f931caad tree 9fe0694bf2bc7e3467f3a90f517bc4723488e59c parent 9da3b1ad7b074effd56729f9fc01cc5abf6503cc author Al Viro Sun, 08 Oct 2006 15:01:14 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:36 -0700 [PATCH] missing include in pdaudiocf_irq Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 9da3b1ad7b074effd56729f9fc01cc5abf6503cc tree 3baee72cc871c647f7e2ee84d6599ad185a0c482 parent 28431146993e0ab3a2a592af8541543fe0cc2c8e author Al Viro Sun, 08 Oct 2006 15:00:44 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:36 -0700 [PATCH] misc ppc pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 28431146993e0ab3a2a592af8541543fe0cc2c8e tree 669550724d03d9a9b829a5d6229f28fcb0d46cc0 parent 5dcded1b0b4f1537bb6dff453fb805517756c94b author Al Viro Sun, 08 Oct 2006 15:00:12 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:36 -0700 [PATCH] misc arm pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 5dcded1b0b4f1537bb6dff453fb805517756c94b tree 1cc2da28034a9ffd3555eb9e5372392b1518061a parent 2f116cbf369ec3148cef9821f6c7f2b8fb78a071 author Al Viro Sun, 08 Oct 2006 14:59:19 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:36 -0700 [PATCH] missed ia64 pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 2f116cbf369ec3148cef9821f6c7f2b8fb78a071 tree 29de6de6fe62e282f4cfdba081e313d9cb27698f parent 4fa1970a23bf8fc68e86b65a87c32556e20a6be6 author Al Viro Sun, 08 Oct 2006 14:45:28 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:36 -0700 [PATCH] alpha pt_regs cleanups: collapse set_irq_regs() in titan_dispatch_irqs() titan_dispatch_irqs() always gets get_irq_regs() as argument; kill the argument and collapse set_irq_regs() in body. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 4fa1970a23bf8fc68e86b65a87c32556e20a6be6 tree b6b46dd929623c302b3c3732cbeb5dbff2f7e95f parent 3dbb8c62897f96bbf5d4e4fe649e5d3791fc33c5 author Al Viro Sun, 08 Oct 2006 14:44:38 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:36 -0700 [PATCH] alpha pt_regs cleanups: machine_check() do set_irq_regs() in caller, kill pt_regs argument. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 3dbb8c62897f96bbf5d4e4fe649e5d3791fc33c5 tree bd5335388a8ae63037d82e98ca529c36290fd2ee parent 7ca56053b29633ef08b14e5ca16c663363edac36 author Al Viro Sun, 08 Oct 2006 14:37:32 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:35 -0700 [PATCH] alpha pt_regs cleanups: handle_irq() isa_no_iack_sc_device_interrupt() always gets get_irq_regs() as argument; kill that argument. All but two callers of handle_irq() pass get_irq_regs() as argument; convert the remaining two, kill set_irq_regs() inside handle_irq(). Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7ca56053b29633ef08b14e5ca16c663363edac36 tree f8940145602aca5ea9ff35c9c8b5dc508e23d611 parent 8dab42a96781a1100a6b5cc6a66953fc51c30bc1 author Al Viro Sun, 08 Oct 2006 14:36:08 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:35 -0700 [PATCH] alpha pt_regs cleanups: device_interrupt callers of ->device_interrupt() do set_irq_regs() now; pt_regs argument removed, remaining uses of regs in instances of ->device_interrupt() are switched to get_irq_regs() and will be gone in the next patch. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8dab42a96781a1100a6b5cc6a66953fc51c30bc1 tree 16240fb885f3c33c66e250c094e61596991de71f parent 7a39f52202a70ff6834e37053e2ee55c7d351621 author Al Viro Sun, 08 Oct 2006 14:33:33 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:35 -0700 [PATCH] m68k pt_regs fixes, part 2 Fallout from previous patch: - actually add include/asm-m68k/irq_regs.h - missed the prototype of sun3_sched_init() NB: git diff without argumentgs sucks when you've added some files... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7a39f52202a70ff6834e37053e2ee55c7d351621 tree de2f029495110336d2dd2b89205db2c62710dd50 parent 6d24c8dc2e656b02807aa0506405727d34c0376c author Al Viro Sun, 08 Oct 2006 14:32:15 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:35 -0700 [PATCH] sparc32 rwlock fix read_trylock() is broken on sparc32 (doesn't build and didn't work right, actually). Proposed fix: - make "writer holds lock" distinguishable from "reader tries to grab lock" - have __raw_read_trylock() try to acquire the mutex (in LSB of lock), terminating spin if we see that there's writer holding it. Then do the rest as we do in read_lock(). Thanks to Ingo for discussion... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 6d24c8dc2e656b02807aa0506405727d34c0376c tree ab5399601650d9dec7274bcc1ce22a7e490c1c61 parent 0d84438d98777b0f9425d39121c42f47a06878ca author Al Viro Sun, 08 Oct 2006 08:23:28 -0400 committer Linus Torvalds Sun, 08 Oct 2006 12:32:35 -0700 [PATCH] sparc64 pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 0d84438d98777b0f9425d39121c42f47a06878ca tree 9d3486664ecf836183f982f7011c5b8b37c4091e parent 7ff3e52cf2947ebd38c84159af68e5a29d228f6c author Al Viro Sun, 08 Oct 2006 14:30:44 +0100 committer Linus Torvalds Sun, 08 Oct 2006 12:32:35 -0700 [PATCH] sparc32 pt_regs fixes Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 7ff3e52cf2947ebd38c84159af68e5a29d228f6c tree 17f1a54b368554b722c18c28852ded0f90856865 parent ff3df54efacff4ecdcab32826e45798453eecf90 parent b7a7179dcae6cecfaaa8384f8c088fb7823c6c90 author Linus Torvalds Sun, 08 Oct 2006 12:28:41 -0700 committer Linus Torvalds Sun, 08 Oct 2006 12:28:41 -0700 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6: ieee1394: nodemgr: fix startup of knodemgrd commit ff3df54efacff4ecdcab32826e45798453eecf90 tree 9eef08a9092f88d6bf11fb039cb95546642eab39 parent c7111c1318ee8890f385813f232fdb32643e2653 parent c7753f18711782738936f224aaa421468e87f6ed author Linus Torvalds Sun, 08 Oct 2006 12:26:00 -0700 committer Linus Torvalds Sun, 08 Oct 2006 12:26:00 -0700 Merge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6 * 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6: [PARISC] More pt_regs removal [PARISC] pdc_init no longer exists [PARISC] Make firmware calls irqsafe-ish... [PA-RISC] Fix boot breakage [PARISC] Use set_irq_regs commit c7111c1318ee8890f385813f232fdb32643e2653 tree e21f8ee81f45f0c127a6233ed77d8052615d1fc8 parent b940d22d58c41b2ae491dca9232850f6f38f3653 author Eric W. Biederman Sun, 08 Oct 2006 07:47:55 -0600 committer Linus Torvalds Sun, 08 Oct 2006 12:24:02 -0700 [PATCH] x86_64 irq: Allocate a vector across all cpus for genapic_flat. The problem we can't take advantage of lowest priority delivery mode if the vectors are allocated for only one cpu at a time. Nor can we work around hardware that assumes lowest priority delivery mode is always used with several cpus. So this patch introduces the concept of a vector_allocation_domain. A set of cpus that will receive an irq on the same vector. Currently the code for implementing this is placed in the genapic structure so we can vary this depending on how we are using the io_apics. This allows us to restore the previous behaviour of genapic_flat without removing the benefits of having separate vector allocation for large machines. This should also fix the problem report where a hyperthreaded cpu was receving the irq on the wrong hyperthread when in logical delivery mode because the previous behaviour is restored. This patch properly records our allocation of the first 16 irqs to the first 16 available vectors on all cpus. This should be fine but it may run into problems with multiple interrupts at the same interrupt level. Except for some badly maintained comments in the code and the behaviour of the interrupt allocator I have no real understanding of that problem. Signed-off-by: Eric W. Biederman Acked-by: Muli Ben-Yehuda Signed-off-by: Linus Torvalds commit b940d22d58c41b2ae491dca9232850f6f38f3653 tree 86a6a44c791ac55f1ea0f76f61248df55d20cf6a parent 7da5d406792eedb5341a8c20296470b2e67743e7 author Eric W. Biederman Sun, 08 Oct 2006 07:43:46 -0600 committer Linus Torvalds Sun, 08 Oct 2006 12:24:02 -0700 [PATCH] i386/x86_64: Remove global IO_APIC_VECTOR Which vector an irq is assigned to now varies dynamically and is not needed outside of io_apic.c. So remove the possibility of accessing the information outside of io_apic.c and remove the silly macro that makes looking for users of irq_vector difficult. The fact this compiles ensures there aren't any more pieces of the old CONFIG_PCI_MSI weirdness that I failed to remove. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit 7da5d406792eedb5341a8c20296470b2e67743e7 tree e0bb0625be2631eb22b39526d7dd0c5543c1654e parent ca4aa09635516258f158a7bc1594a794e4c34864 author Eric W. Biederman Sun, 08 Oct 2006 07:41:19 -0600 committer Linus Torvalds Sun, 08 Oct 2006 12:24:02 -0700 [PATCH] i386/x86_64: FIX pci_enable_irq to set dev->irq to the irq number In commit ace80ab796ae30d2c9ee8a84ab6f608a61f8b87b I removed the weird logic that used the vector number as the irq number when MSI was defined. However pci_enable_irq was using a different test in the io_apic_assign_irqs path and I missed it :( This patch removes the wrong code so no one hits this problem. This code is only active when a specific set of boot command line parameters is specified which likely explains why no one has notices this earlier. Signed-off-by: Eric W. Biederman Signed-off-by: Linus Torvalds commit ca4aa09635516258f158a7bc1594a794e4c34864 tree 7b8632778a068ee083e463266a72530d0297fa04 parent f1d08f71974dcf68ce4510a2dfaeb798b05df2c0 author Trond Myklebust Sun, 08 Oct 2006 14:33:24 -0400 committer Linus Torvalds Sun, 08 Oct 2006 12:07:03 -0700 [PATCH] NFS: Fix typo in nfs_get_client() NFS_CS_INITING > NFS_CS_READY, so instead of waiting for the structure to get initialised, we currently immediately jump out of the loop without ever sleeping. Signed-off-by: Trond Myklebust Signed-off-by: Linus Torvalds commit b7a7179dcae6cecfaaa8384f8c088fb7823c6c90 tree 613b16f40e2bf6a71f10edb058afe292e8acf2d2 parent 3253b669eed7194ae490acb4aadab7262bbfeb8d author Stefan Richter Fri, 06 Oct 2006 19:49:52 +0200 committer Stefan Richter Sun, 08 Oct 2006 12:10:26 +0200 ieee1394: nodemgr: fix startup of knodemgrd Revert a thinko in commit d2f119fe319528da8c76a1107459d6f478cbf28c: When knodemgrd starts, it needs to sleep until host->generation was incremented above its initial value of 0. My wrong logic caused it to start sending requests when the bus wasn't completely ready. Seen as "AT dma reset ctx=0, aborting transmission" messages in 2.6.19-rc1. Signed-off-by: Stefan Richter commit f1d08f71974dcf68ce4510a2dfaeb798b05df2c0 tree b96704ba048c2b302fc18b1b6d520c127b809ad3 parent 937a801576f954bd030d7c4a5a94571710d87c0b author Yoichi Yuasa Sat, 07 Oct 2006 13:41:51 +0900 committer Ralf Baechle Sun, 08 Oct 2006 02:38:28 +0100 [MIPS] Fix DECserial build error by IRQ hander change Signed-off-by: Yoichi Yuasa Signed-off-by: Ralf Baechle commit 937a801576f954bd030d7c4a5a94571710d87c0b tree 48d3440f765b56cf32a89b4b8193dd033d8227a8 parent 31aa36658a123263a9a69896e348b9600e050679 author Ralf Baechle Sat, 07 Oct 2006 19:44:33 +0100 committer Ralf Baechle Sun, 08 Oct 2006 02:38:28 +0100 [MIPS] Complete fixes after removal of pt_regs argument to int handlers. Signed-off-by: Ralf Baechle commit 31aa36658a123263a9a69896e348b9600e050679 tree 3b75e5b5c651834d103a7d7f6b3b34eaf715bc94 parent 5c90d528b21cb9506713f92730f33246b80ecc25 author Karl-Johan Karlsson Sun, 08 Oct 2006 01:15:02 +0200 committer Ralf Baechle Sun, 08 Oct 2006 02:38:27 +0100 [MIPS] Show actual CPU information in /proc/cpuinfo Currently, /proc/cpuinfo contains several copies of the information for whatever processor we happen to be scheduled on. This patch makes it contain the proper information for each CPU, which is particularly useful on mixed R12k/R10k IP27 machines. Signed-off-by: Karl-Johan Karlsson Signed-off-by: Ralf Baechle commit 5c90d528b21cb9506713f92730f33246b80ecc25 tree b53351883fdb5fb7974c9ceddea5dafc3d1dc159 parent 59d6ab86a6b1097d5e5eae5d820f8e2661009324 author Scott Ashcroft Fri, 06 Oct 2006 16:54:54 +0100 committer Ralf Baechle Sun, 08 Oct 2006 02:38:27 +0100 [MIPS] Cobalt: Time runs too quickly A kernel built with HZ==250 runs about 4 four times too quickly on a Cobalt RaQ2. Signed-off-by: Scott Ashcroft Signed-off-by: Ralf Baechle commit 59d6ab86a6b1097d5e5eae5d820f8e2661009324 tree 498967318ff5a96fd279ce670b49ec59c951a112 parent ba00003aa83a61b615542dd66f5af8fb4a7cee1d author Ralf Baechle Fri, 06 Oct 2006 17:36:20 +0100 committer Ralf Baechle Sun, 08 Oct 2006 02:38:27 +0100 [MIPS] Update Malta config. Signed-off-by: Ralf Baechle commit ba00003aa83a61b615542dd66f5af8fb4a7cee1d tree 013dde7e89730e54433aa40b5e9d67997931aed6 parent 9c8e7f5cc965d30006c917ab19221e06fcc5a4f9 parent 40a5f7ca07f8e1d77acdba5ae0c11c15cb7520c1 author Linus Torvalds Sat, 07 Oct 2006 10:52:00 -0700 committer Linus Torvalds Sat, 07 Oct 2006 10:52:00 -0700 Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] PReP fixup after irq changes [POWERPC] SPU fixup after irq changes [POWERPC] Fix up after irq changes [POWERPC] Fix iseries/smp.c for irq breakage [POWERPC] Fix viocons for irq breakage [POWERPC] Update iseries_defconfig [POWERPC] Fix fsl_soc build breaks [POWERPC] Minor fix for bootargs property [POWERPC] Update MTFSF_L() comment [POWERPC] Update pSeries defconfig for SATA [POWERPC] Don't get PCI IRQ from OF for devices with no IRQ [POWERPC] Fix zImage decompress location [POWERPC] linux,tce-size property is 32 bits [POWERPC] Add DTS for MPC8349E-mITX board [POWERPC] Fix harmless typo [PPC] Fix some irq breakage with ARCH=ppc commit 9c8e7f5cc965d30006c917ab19221e06fcc5a4f9 tree 2ee465eedaec181e1eb8f50acbc0f86c03325a32 parent 8774cb815f2492a95b90a927f93a2de555753b32 author Al Viro Sat, 07 Oct 2006 16:29:18 +0100 committer Linus Torvalds Sat, 07 Oct 2006 10:51:15 -0700 [PATCH] m32r pt_regs fixes ... and now with irq_regs.h not forgotten... Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 8774cb815f2492a95b90a927f93a2de555753b32 tree 40725c7a7b0618811b2f09753a4e4cd88c1db3e2 parent 2850bc273776cbb1b510c5828e9e456dffb50a32 author Al Viro Sat, 07 Oct 2006 14:17:31 +0100 committer Linus Torvalds Sat, 07 Oct 2006 10:51:14 -0700 [PATCH] minimal alpha pt_regs fixes Signed-off-by: Al Viro Acked-by: Jeff Garzik Signed-off-by: Linus Torvalds commit 2850bc273776cbb1b510c5828e9e456dffb50a32 tree 340bd599b6efde40618ef89de59cbe957269eac2 parent 00079e04fe478cd3c59ae2106ef2fbe779e67024 author Al Viro Sat, 07 Oct 2006 14:16:45 +0100 committer Linus Torvalds Sat, 07 Oct 2006 10:51:14 -0700 [PATCH] m68k pt_regs fixes m68k_handle_int() split in two functions: __m68k_handle_int() takes pt_regs * and does set_irq_regs(); m68k_handle_int() doesn't get pt_regs *. Places where we used to call m68k_handle_int() recursively with the same pt_regs have simply lost the second argument, the rest is switched to __m68k_handle_int(). The rest of patch is just dropping pt_regs * where needed. Signed-off-by: Al Viro Signed-off-by: Linus Torvalds commit 00079e04fe478cd3c59ae2106ef2fbe779e67024 tree 91a24f8b7a46c35d06375290fd6c467a2553283d parent 5c339d4541995df2fd3ca31a84c042e7afe9b3c1 author Eric Eric Sesterhenn Fri, 06 Oct 2006 22:19:45 -0700 committer Linus Torvalds Sat, 07 Oct 2006 10:51:14 -0700 [PATCH] reiserfs: null pointer dereferencing in reiserfs_read_bitmap_block null pointer dereferencing in reiserfs_read_bitmap_block. Signed-off-by: Alexander Zarochentsev Cc: Jeff Mahoney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5c339d4541995df2fd3ca31a84c042e7afe9b3c1 tree 30c0470cd8b3f2be514b03328d6c0519fc6ed7b8 parent dcbd4ec4c258f88d4cfd3c309c8a56faff061340 author Rafael J. Wysocki Fri, 06 Oct 2006 22:19:44 -0700 committer Linus Torvalds Sat, 07 Oct 2006 10:51:14 -0700 [PATCH] swsusp: Make userland suspend work on SMP again Unfortunately one of the recent changes in swsusp has broken the userland suspend on SMP. Fix it. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dcbd4ec4c258f88d4cfd3c309c8a56faff061340 tree bad0bb2821f1c2759b709ff29c592f14078ede95 parent ada26d41e9ee1da31d11957b4452f4227a292e10 author Christoph Lameter Fri, 06 Oct 2006 22:19:44 -0700 committer Linus Torvalds Sat, 07 Oct 2006 10:51:14 -0700 [PATCH] slab: remove wrongly placed BUG_ON Init list is called with a list parameter that is not equal to the cachep->nodelists entry under NUMA if more than one node exists. This is fully legitimatei. One may want to populate the list fields before switching nodelist pointers. Signed-off-by: Christoph Lameter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 40a5f7ca07f8e1d77acdba5ae0c11c15cb7520c1 tree d568687f532826dd5dca6639529aa9e58e612228 parent f5a924581a4e7b9bc29a49ee1397dcaaacd5f25f author Olaf Hering Fri, 06 Oct 2006 23:06:48 +0200 committer Paul Mackerras Sat, 07 Oct 2006 22:11:20 +1000 [POWERPC] PReP fixup after irq changes Compile fixes for PReP in ARCH=ppc. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit f5a924581a4e7b9bc29a49ee1397dcaaacd5f25f tree 5c1a3b015412e7171388ff94180616af6f41c481 parent 35a84c2f56e0f77ea2c5a4327b17104705f4c8c7 author Olaf Hering Fri, 06 Oct 2006 22:52:16 +0200 committer Paul Mackerras Sat, 07 Oct 2006 22:11:17 +1000 [POWERPC] SPU fixup after irq changes Remove struct pt_regs * from remaining spu irq functions. Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit 35a84c2f56e0f77ea2c5a4327b17104705f4c8c7 tree 856df3bb21b1a9c7910d956b4ee59be2041b7525 parent 1224f373c974eacc46fe5e1073422c794d0b0d34 author Olaf Hering Sat, 07 Oct 2006 22:08:26 +1000 committer Paul Mackerras Sat, 07 Oct 2006 22:08:26 +1000 [POWERPC] Fix up after irq changes Remove struct pt_regs * from all handlers. Also remove the regs argument from get_irq() functions. Compile tested with arch/powerpc/config/* and arch/ppc/configs/prep_defconfig Signed-off-by: Olaf Hering Signed-off-by: Paul Mackerras commit c7753f18711782738936f224aaa421468e87f6ed tree 7152347bb02452a54beb67a1f553db968c2c5615 parent bbd6330ea1154fc13a351263160d4f9cca2ff5d9 author Matthew Wilcox Sat, 07 Oct 2006 06:01:11 -0600 committer Matthew Wilcox Sat, 07 Oct 2006 06:01:11 -0600 [PARISC] More pt_regs removal Remove pt_regs from ipi_interrupt and timer_interrupt. Inline smp_do_timer() into its only caller, and unify the SMP and non-SMP paths. Fixes a profiling bug. Signed-off-by: Matthew Wilcox commit bbd6330ea1154fc13a351263160d4f9cca2ff5d9 tree f627bae4603315f9e25556e1837cb1989ed7621a parent 09690b18b7b9696bb719b246e77c7af9952da12c author Matthew Wilcox Fri, 06 Oct 2006 23:45:09 -0400 committer Matthew Wilcox Sat, 07 Oct 2006 05:22:30 -0600 [PARISC] pdc_init no longer exists Just a stale prototype Signed-off-by: Matthew Wilcox commit 09690b18b7b9696bb719b246e77c7af9952da12c tree 0efe3f79c9e9fd397d78fc17ee322915fd3a1905 parent ba0e427f215b1c58881a737f46d30ae03b83178c author Kyle McMartin Thu, 05 Oct 2006 23:45:45 -0400 committer Matthew Wilcox Sat, 07 Oct 2006 05:21:03 -0600 [PARISC] Make firmware calls irqsafe-ish... There's no reason why we shouldn't be using _irqsave instead of _irq for any of these calls. fwiw, this fixes the "start_kernel(): bug: interrupts were enabled early" message displayed on bootup recently. Signed-off-by: Kyle McMartin Signed-off-by: Matthew Wilcox commit ba0e427f215b1c58881a737f46d30ae03b83178c tree 8e8b80ef439d4a5d096f9dbc78bafa2c57fe2cee parent e11e30a063b515e95fb590f1558b5fea21273c63 author Matthew Wilcox Wed, 04 Oct 2006 22:57:28 -0600 committer Matthew Wilcox Sat, 07 Oct 2006 05:18:15 -0600 [PA-RISC] Fix boot breakage Conditionals were the wrong way around. Turns out I was booting the wrong kernel when testing the original fix. Signed-off-by: Matthew Wilcox commit e11e30a063b515e95fb590f1558b5fea21273c63 tree 4f5aff98e2d14dbd3ded2ba20f791db3b2540815 parent ada26d41e9ee1da31d11957b4452f4227a292e10 author Matthew Wilcox Sat, 07 Oct 2006 05:11:07 -0600 committer Matthew Wilcox Sat, 07 Oct 2006 05:11:07 -0600 [PARISC] Use set_irq_regs Actually set the irq_regs pointer. Signed-off-by: Matthew Wilcox commit ada26d41e9ee1da31d11957b4452f4227a292e10 tree dfaf212edd5f6d1b749226cdd35c706cdc0f3c14 parent d150ad7bd946f066c98a9725685109dcffae0cba parent be577a5220b25e0a6e3fbf96bbfc8b31d63e9ea9 author Linus Torvalds Fri, 06 Oct 2006 20:12:11 -0700 committer Linus Torvalds Fri, 06 Oct 2006 20:12:11 -0700 Merge branch 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6 * 'irq-fixes' of git://git.parisc-linux.org/git/linux-2.6: Build fixes for struct pt_regs removal commit be577a5220b25e0a6e3fbf96bbfc8b31d63e9ea9 tree 57e159a2b6f48c4b2f20497ced1d653a7fea4834 parent e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 author Matthew Wilcox Fri, 06 Oct 2006 20:47:23 -0600 committer Matthew Wilcox Fri, 06 Oct 2006 20:47:23 -0600 Build fixes for struct pt_regs removal Signed-off-by: Matthew Wilcox commit 1224f373c974eacc46fe5e1073422c794d0b0d34 tree 6808d01c6ebc123ecc525b6b3ade50ca201bafbf parent 27db2d0cb9b56210dc1e29bc89a7413f3ae67b91 author Stephen Rothwell Fri, 06 Oct 2006 13:55:26 +1000 committer Paul Mackerras Sat, 07 Oct 2006 10:10:30 +1000 [POWERPC] Fix iseries/smp.c for irq breakage Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 27db2d0cb9b56210dc1e29bc89a7413f3ae67b91 tree 44c4c0d7814c72902ad1b3847d8efec03232cf4d parent b75f3f751c17e01544bd6706e54efae35d66d446 author Stephen Rothwell Fri, 06 Oct 2006 13:54:28 +1000 committer Paul Mackerras Sat, 07 Oct 2006 10:10:27 +1000 [POWERPC] Fix viocons for irq breakage Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit b75f3f751c17e01544bd6706e54efae35d66d446 tree 6206bd33e3251eac134c3719b5cf64418195a06d parent 2b00b254debd707571f20149dbd4b45264a120e5 author Stephen Rothwell Fri, 06 Oct 2006 13:53:12 +1000 committer Paul Mackerras Sat, 07 Oct 2006 10:10:17 +1000 [POWERPC] Update iseries_defconfig This make sure that an iseries_defconfig does not inlude other platforms. Signed-off-by: Stephen Rothwell Signed-off-by: Paul Mackerras commit 2b00b254debd707571f20149dbd4b45264a120e5 tree 00a14f28f52bad1456c2510eaa98a424e26714a1 parent c1ce464d29e5bbf5819b2d7527b7d3030a6d65f1 author Olof Johansson Thu, 05 Oct 2006 21:16:48 -0500 committer Paul Mackerras Sat, 07 Oct 2006 10:10:13 +1000 [POWERPC] Fix fsl_soc build breaks Hrm, there's no way this ever built at time of merge. There's a missing } and the wrong type on phy_irq. Also, another const for get_property(). CC arch/powerpc/sysdev/fsl_soc.o arch/powerpc/sysdev/fsl_soc.c: In function 'fs_enet_of_init': arch/powerpc/sysdev/fsl_soc.c:625: error: assignment of read-only variable 'phy_irq' arch/powerpc/sysdev/fsl_soc.c:625: warning: assignment makes integer from pointer without a cast arch/powerpc/sysdev/fsl_soc.c:661: warning: assignment discards qualifiers from pointer target type arch/powerpc/sysdev/fsl_soc.c:684: error: subscripted value is neither array nor pointer arch/powerpc/sysdev/fsl_soc.c:687: error: subscripted value is neither array nor pointer arch/powerpc/sysdev/fsl_soc.c:722: warning: ISO C90 forbids mixed declarations and code arch/powerpc/sysdev/fsl_soc.c:728: error: invalid storage class for function 'cpm_uart_of_init' arch/powerpc/sysdev/fsl_soc.c:798: error: initializer element is not constant arch/powerpc/sysdev/fsl_soc.c:798: error: expected declaration or statement at end of input make[1]: *** [arch/powerpc/sysdev/fsl_soc.o] Error 1 Signed-off-by: Olof Johansson Signed-off-by: Paul Mackerras commit d150ad7bd946f066c98a9725685109dcffae0cba tree 8157b0f8690dca44f5644d28f3773afc9badc71b parent e630015504cdd4d166c371fec39b8ca258fcbc0e author Andrew Morton Fri, 06 Oct 2006 13:28:09 -0700 committer Linus Torvalds Fri, 06 Oct 2006 13:36:52 -0700 [PATCH] x86_64 irq_regs fix smp_apic_timer_interrupt() needs to stack the pt_regs* for profile_tick. If any other of those APIC interrupt handlers want to run get_irq_regs() then their C entrypoint handlers will need the same treatment. Cc: Andi Kleen Cc: David Howells Signed-off-by: Andrew Morton Acked-by: Andrew Vasquez Signed-off-by: Linus Torvalds commit e630015504cdd4d166c371fec39b8ca258fcbc0e tree dc9eccdf841b86099f4fa6e14711058f3ddcf573 parent e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 author Linus Torvalds Fri, 06 Oct 2006 13:11:15 -0700 committer Linus Torvalds Fri, 06 Oct 2006 13:11:15 -0700 ARM: fix up nested irq regs usage This should fix up the per-cpu irq register pointer if we have nested hardware interrupts. Signed-off-by: Linus Torvalds commit 5d347c8abaab1e8c24272a53099c22482855783e tree 3e267ced787b4ae18dd2c6275c1b8a83884f96b6 parent e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 parent d87dbede030d17770aa6a6170e70ab6f8044e5ae author Jeff Garzik Fri, 06 Oct 2006 15:27:31 -0400 committer Jeff Garzik Fri, 06 Oct 2006 15:27:31 -0400 Merge branch 'submit1' of viper:/spare/repo/irq-remove-2.6 into irqcleanups commit e317c8ccaaf900abf39cc3240e4dc5ba82a3cc67 tree 327b25cecd21d97097b1249fe73a5c9ff2a6bcc6 parent b7696ee3c050a76a6cebccdbadfc93896b336e44 author Frederik Deweerdt Fri, 06 Oct 2006 18:58:24 +0000 committer Linus Torvalds Fri, 06 Oct 2006 12:11:08 -0700 [PATCH] ixp4xxdefconfig arm fixes With the following patch, the ixp4xxdefconfig builds correctly. I'll test some more configs if I get some time. Signed-off-by: Frederik Deweerdt Signed-off-by: Linus Torvalds commit b7696ee3c050a76a6cebccdbadfc93896b336e44 tree b6b722183e8e95d5497a9cb77de1a4f3dd394703 parent 20ebba65093e7bbae1421f071cffed436048e700 author Olaf Hering Fri, 06 Oct 2006 20:53:10 +0200 committer Linus Torvalds Fri, 06 Oct 2006 12:11:08 -0700 [PATCH] fix mesh compile errors after irq changes drivers/scsi/mesh.c:469: error: too many arguments to function 'mesh_interrupt' drivers/scsi/mesh.c:507: error: too many arguments to function 'mesh_interrupt' Signed-off-by: Olaf Hering Signed-off-by: Linus Torvalds commit d87dbede030d17770aa6a6170e70ab6f8044e5ae tree e3d8920485750da042628fe0fe1369c3effbf73b parent 8f4aff6cb178b0a580ee206e7cca63e2d31f4a4e author Jeff Garzik Fri, 06 Oct 2006 15:04:35 -0400 committer Jeff Garzik Fri, 06 Oct 2006 15:04:35 -0400 drivers/isdn/act2000: kill irq2card_map Eliminate irq->card lookup table, by properly passing the card pointer via request_irq() like other drivers. Signed-off-by: Jeff Garzik commit 8f4aff6cb178b0a580ee206e7cca63e2d31f4a4e tree ccf26a8f693970f939f470ea3500bd585a4a7bb9 parent c7bec5aba52392aa8d675b8722735caf4a8b7265 author Jeff Garzik Fri, 06 Oct 2006 15:03:04 -0400 committer Jeff Garzik Fri, 06 Oct 2006 15:03:04 -0400 drivers/net/eepro: kill dead code The irq2dev_map has not been used for a long time. Signed-off-by: Jeff Garzik commit c7bec5aba52392aa8d675b8722735caf4a8b7265 tree 8087cfd2866e63fba25e18ba1fa0f374c27be4f0 parent c31f28e778ab299a5035ea2bda64f245b8915d7c author Jeff Garzik Fri, 06 Oct 2006 15:00:58 -0400 committer Jeff Garzik Fri, 06 Oct 2006 15:00:58 -0400 Various drivers' irq handlers: kill dead code, needless casts - Eliminate casts to/from void* - Eliminate checks for conditions that never occur. These typically fall into two classes: 1) Checking for 'dev_id == NULL', then it is never called with NULL as an argument. 2) Checking for invalid irq number, when the only caller (the system) guarantees the irq handler is called with the proper 'irq' number argument. Signed-off-by: Jeff Garzik commit c31f28e778ab299a5035ea2bda64f245b8915d7c tree 92d1070b0ae0c3528ab2c8787c4402fd8adf5a5f parent 86d91bab4806191a8126502d80d729c2a4765ebe author Jeff Garzik Fri, 06 Oct 2006 14:56:04 -0400 committer Jeff Garzik Fri, 06 Oct 2006 14:56:04 -0400 drivers/net: eliminate irq handler impossible checks, needless casts - Eliminate check for irq handler 'dev_id==NULL' where the condition never occurs. - Eliminate needless casts to/from void* Signed-off-by: Jeff Garzik commit 20ebba65093e7bbae1421f071cffed436048e700 tree c3dfc619b4db65e732859f5490a51df7d20960eb parent 815a965b0e6d925646e1f6012175830ef21e0d21 parent 5a078351d2d0a7ae834087de3637eb42cfd209e3 author Linus Torvalds Fri, 06 Oct 2006 11:35:08 -0700 committer Linus Torvalds Fri, 06 Oct 2006 11:35:08 -0700 Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa * 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: [ALSA] version 1.0.13 [ALSA] sound/pci/au88x0/au88x0.c: ioremap balanced with iounmap [ALSA] Handle file operations during snd_card disconnects using static file->f_op [ALSA] emu10k1: Fix outl() in snd_emu10k1_resume_regs() [ALSA] Repair snd-usb-usx2y for usb 2.6.18 [ALSA] Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check() [ALSA] Dereference after free in snd_hwdep_release() [ALSA] Fix memory leak in sound/isa/es18xx.c [ALSA] hda-intel - New pci id for Nvidia MCP61 [ALSA] Add new subdevice ids for hda-intel [ALSA] WM9712 fixes for ac97_patch.c [ALSA] hda/patch_si3054: new codec vendor IDs commit 5a078351d2d0a7ae834087de3637eb42cfd209e3 tree 03a92e02b8d43e40bfe3d5f843ca5ae18cefb659 parent 8a238c7b6a2ec1852419e8fb8b8b0457c55c47e6 author Jaroslav Kysela Fri, 06 Oct 2006 20:28:26 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:28:26 +0200 [ALSA] version 1.0.13 Signed-off-by: Jaroslav Kysela commit 8a238c7b6a2ec1852419e8fb8b8b0457c55c47e6 tree 13d69d08d608963c592c3a1f90ae998acfb68db3 parent a9edfc60227a1dc5c741666ff252a6055b73b184 author Amol Lad Fri, 06 Oct 2006 16:45:19 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:23:05 +0200 [ALSA] sound/pci/au88x0/au88x0.c: ioremap balanced with iounmap Signed-off-by: Amol Lad Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit a9edfc60227a1dc5c741666ff252a6055b73b184 tree 15993e126624ec9e05f33f957ee4f69bd4787220 parent 4130d59b1ac6e32c130bd59dbce5eb30fede0197 author Karsten Wiese Fri, 06 Oct 2006 16:08:27 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:23:04 +0200 [ALSA] Handle file operations during snd_card disconnects using static file->f_op Alsa used to kmalloc one file->f_op per file per disconnecting snd_card. This led to oopses sometimes when file->f_op was freed before __fput() finished. Patch adds a virtual device for disconnect: VDD. VDD consists of: LIST_HEAD(shutdown_files) protected by DEFINE_SPINLOCK(shutdown_mutex) static struct file_operations snd_shutdown_f_ops and functions assigned to it Additions to struct snd_monitor_file to specify if instance is hidden by VDD or not. A VDD's instance is created in snd_card_disconnect() under the card->files_lock. cleaned up in snd_card_file_remove() under the card->files_lock. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 4130d59b1ac6e32c130bd59dbce5eb30fede0197 tree d238a1b1e21918de75e32078551bdc2cbf663ad7 parent 635bbb355ebb735647ca49fb649a6a7edea9b3ed author Arnaud Patard Wed, 04 Oct 2006 18:21:05 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:23:03 +0200 [ALSA] emu10k1: Fix outl() in snd_emu10k1_resume_regs() The emu10k1 driver saves the A_IOCFG and HCFG register on suspend and restores it on resumes. Unfortunately, this doesn't work as the arguments to outl() are reversed. Signed-off-by: Arnaud Patard Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 635bbb355ebb735647ca49fb649a6a7edea9b3ed tree a6bee5a4d355feb684c4996e00308e07bec4a4fc parent 9b08c2aa54948361da0e2d26b47e3bcb8f8911e8 author Karsten Wiese Wed, 04 Oct 2006 17:17:32 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:23:02 +0200 [ALSA] Repair snd-usb-usx2y for usb 2.6.18 urb->start_frame rolls over beyond MAX_INT now. This is for stable kernel and stable alsa. Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 9b08c2aa54948361da0e2d26b47e3bcb8f8911e8 tree d52df581096117e5cd75495f0defbdeebde0095b parent 104326f8df9925317cca64b84249d3eac5de7c74 author Karsten Wiese Wed, 04 Oct 2006 17:16:46 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:23:01 +0200 [ALSA] Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check() Fix bug in snd-usb-usx2y's usX2Y_pcms_lock_check() substream can be NULL...... in mainline, bug was introduced by: 2006-06-22 [ALSA] Add O_APPEND flag support to PCM Signed-off-by: Karsten Wiese Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 104326f8df9925317cca64b84249d3eac5de7c74 tree c97b00520884caf405da958c0f04b07ed21017f7 parent 92b93d31718a3ccbbcf911d2f570bb345c496d66 author Florin Malita Fri, 29 Sep 2006 12:55:25 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:22:59 +0200 [ALSA] Dereference after free in snd_hwdep_release() snd_card_file_remove() may free hw->card so we can't dereference hw->card->module after that. Coverity ID 1420. Signed-off-by: Florin Malita Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 92b93d31718a3ccbbcf911d2f570bb345c496d66 tree e58c6d4aef026322eec71e9fae350e79f65174e2 parent f3838ba9204cd8af83c4358379221af66d77714e author Eric Sesterhenn Thu, 28 Sep 2006 12:35:48 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:22:58 +0200 [ALSA] Fix memory leak in sound/isa/es18xx.c Fixed a memory leak in the error patch. Signed-off-by: Eric Sesterhenn Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit f3838ba9204cd8af83c4358379221af66d77714e tree c058a20edeb18e1815e1b7e070208001568830f5 parent 7a99795477ca758a4b29ef3595edde2e067af85a author Dan Cyr Tue, 26 Sep 2006 15:32:35 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:22:57 +0200 [ALSA] hda-intel - New pci id for Nvidia MCP61 Added the new PCI id to support Nvidia MCP61 in snd-hda-intel driver. Signed-off-by: Dan Cyr Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 7a99795477ca758a4b29ef3595edde2e067af85a tree 55b2e4b4fedbb1ee284abbea641e7d638cf76a62 parent 2aedbda6f9a51f0a2130c150676a5c99c81fa7a2 author Tobin Davis Tue, 26 Sep 2006 15:30:10 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:22:56 +0200 [ALSA] Add new subdevice ids for hda-intel This patch adds a couple of device ids for Acer laptops. In both cases, the owners got the driver working by adding 'model=acer' to their modprobe.conf files. Signed-off-by: Tobin Davis Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 2aedbda6f9a51f0a2130c150676a5c99c81fa7a2 tree ff05059b08035bd71b0c83da71d12f86f98f8aad parent 476d1205d182e12a74f4197ccc9092ea6a80e15b author Luke Zhang Tue, 26 Sep 2006 15:28:41 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:22:55 +0200 [ALSA] WM9712 fixes for ac97_patch.c This patch by Luke Zhang fixes a couple of issues with the WM9712 support in ac97_patch.c Changes:- o Fix Out3 ZC switch invert. o Extend capture volume control to 6 bits. o Change Mic 1 volume mask to 5 bits (31). o Add Mic 2 volume. Signed-off-by: Luke Zhang Signed-off-by: Liam Girdwood Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 476d1205d182e12a74f4197ccc9092ea6a80e15b tree e9523ace9a25ee691a6702e6fb690ceedce8171b parent 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 author Sasha Khapyorsky Tue, 26 Sep 2006 15:27:38 +0200 committer Jaroslav Kysela Fri, 06 Oct 2006 20:22:54 +0200 [ALSA] hda/patch_si3054: new codec vendor IDs There are additional IDs for Si3054 codec based HDA modems. Most of them were discovered on discuss@linmodems.org list - Thanks to MarvS and all linmodems.org folks. Signed-off-by: Sasha Khapyorsky Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela commit 815a965b0e6d925646e1f6012175830ef21e0d21 tree 3ed45d661b2ff2c8d00f4c28ebefac8521b54be3 parent 428929a234d2c4b8a6d0145d0dcf687fcfa27325 author Jiri Kosina Fri, 06 Oct 2006 11:11:56 +0200 committer Linus Torvalds Fri, 06 Oct 2006 11:15:12 -0700 [PATCH] make kernels with CONFIG_X86_GENERIC and !CONFIG_SMP compilable CONFIG_X86_GENERIC is not exclusively CONFIG_SMP, as mach-default/ could be compiled also for UP archs. The patch fixes compilation error in include/asm/mach-summit/mach_apic.h in case CONFIG_X86_GENERIC && !CONFIG_SMP Signed-off-by: Jiri Kosina Acked-by: Keith Mannthey Signed-off-by: Linus Torvalds commit 428929a234d2c4b8a6d0145d0dcf687fcfa27325 tree dd097eeabbd41c4713be5ea7663f52399183fd84 parent 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 parent 8c1addbc752660e95bbf2128d66b8e5bb38d5fc7 author Linus Torvalds Fri, 06 Oct 2006 11:08:57 -0700 committer Linus Torvalds Fri, 06 Oct 2006 11:08:57 -0700 Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6 * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix breakage from irq change commit 0cd61b68c340a4f901a06e8bb5e0dea4353161c0 tree cfd72be941ecd172627a06dd61d98b55cec63a39 parent da104a83692cf07434ab3b20bf10093bdbc3f97e author Linus Torvalds Fri, 06 Oct 2006 10:53:39 -0700 committer Linus Torvalds Fri, 06 Oct 2006 10:59:54 -0700 Initial blind fixup for arm for irq changes Untested, but this should fix up the bulk of the totally mechanical issues, and should make the actual detail fixing easier. Signed-off-by: Linus Torvalds commit 86d91bab4806191a8126502d80d729c2a4765ebe tree 1f5aa8a8566bc23db6b177117d1e53d3324602b5 parent 49f19ce401edfff937c448dd74c22497da361889 author Jeff Garzik Fri, 06 Oct 2006 13:32:44 -0400 committer Jeff Garzik Fri, 06 Oct 2006 13:32:44 -0400 arch/i386/kernel/time: don't shadow 'irq' function arg Signed-off-by: Jeff Garzik commit 8c1addbc752660e95bbf2128d66b8e5bb38d5fc7 tree 2a04171d9392abd8935224616cff8109e3e8ea48 parent 49f19ce401edfff937c448dd74c22497da361889 author Tony Luck Fri, 06 Oct 2006 10:09:41 -0700 committer Tony Luck Fri, 06 Oct 2006 10:09:41 -0700 [IA64] Fix breakage from irq change A few missed spots in ia64-land from this gigantic commit: 7d12e780e003f93433d49ce78cfedf4b4c52adc5 Signed-off-by: Tony Luck commit da104a83692cf07434ab3b20bf10093bdbc3f97e tree 6343600c318c600f0dcdf71406bf7d993823afd4 parent 96e1a87392293cf895ea99ab70758453897c7bbf parent dc64bef5439c8e1fafea225054da4d8882c9d10c author Linus Torvalds Fri, 06 Oct 2006 09:13:53 -0700 committer Linus Torvalds Fri, 06 Oct 2006 09:13:53 -0700 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] Use CONFIG_GENERIC_TIME and define TOD clock source. [PATCH] sysrq: irq change build fix. [S390] irq change build fixes. [S390] cio: 0 is a valid chpid. [S390] monwriter buffer limit. [S390] ap bus poll thread priority. commit 96e1a87392293cf895ea99ab70758453897c7bbf tree eedb25924e61a5aa0348b872505695c525172451 parent c6b0a9f87b82f25fa35206ec04b5160372eabab4 author Pekka Enberg Fri, 06 Oct 2006 00:44:06 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:42 -0700 [PATCH] um: irq changes break build Fixup broken UML build due to 7d12e780e003f93433d49ce78cfedf4b4c52adc5 "IRQ: Maintain regs pointer globally rather than passing to IRQ handlers". Cc: David Howells Cc: Jeff Dike Cc: Paolo "Blaisorblade" Giarrusso Signed-off-by: Pekka Enberg Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit c6b0a9f87b82f25fa35206ec04b5160372eabab4 tree 849ed55115c95a86a3d164d674c178f9504750a5 parent 5842730de179405d80649231faa0b3f254477434 author NeilBrown Fri, 06 Oct 2006 00:44:05 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:41 -0700 [PATCH] knfsd: tidy up up meaning of 'buffer size' in nfsd/sunrpc There is some confusion about the meaning of 'bufsz' for a sunrpc server. In some cases it is the largest message that can be sent or received. In other cases it is the largest 'payload' that can be included in a NFS message. In either case, it is not possible for both the request and the reply to be this large. One of the request or reply may only be one page long, which fits nicely with NFS. So we remove 'bufsz' and replace it with two numbers: 'max_payload' and 'max_mesg'. Max_payload is the size that the server requests. It is used by the server to check the max size allowed on a particular connection: depending on the protocol a lower limit might be used. max_mesg is the largest single message that can be sent or received. It is calculated as the max_payload, rounded up to a multiple of PAGE_SIZE, and with PAGE_SIZE added to overhead. Only one of the request and reply may be this size. The other must be at most one page. Cc: Greg Banks Cc: "J. Bruce Fields" Signed-off-by: Neil Brown Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5842730de179405d80649231faa0b3f254477434 tree b7597063929ad3e0536d22077bde53b6d5ad13d4 parent ec5a19dd935eb3793e1f6ed491e8035b3d7b1df9 author NeilBrown Fri, 06 Oct 2006 00:44:04 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:41 -0700 [PATCH] md: fix bug where new drives added to an md array sometimes don't sync properly This fixes a bug introduced in 2.6.18. If a drive is added to a raid1 using older tools (mdadm-1.x or raidtools) then it will be included in the array without any resync happening. It has been submitted for 2.6.18.1. Signed-off-by: Neil Brown Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit ec5a19dd935eb3793e1f6ed491e8035b3d7b1df9 tree 931d2ffce2fe444f26b51b076c3472110a3e5a8a parent 45e02b5b52e43aa7a674f64ca3470b9ee51fc9fd author Pierre Ossman Fri, 06 Oct 2006 00:44:03 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:41 -0700 [PATCH] mmc: multi sector write transfers SD cards extend the protocol by allowing the host to query a card how many blocks were successfully stored on the medium. This allows us to safely write chunks of blocks at once. Signed-off-by: Pierre Ossman Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45e02b5b52e43aa7a674f64ca3470b9ee51fc9fd tree 5adb4381f2b0226fd65f8e36367646783a403c6d parent 3260259f0084e51ce21503b130473b78871e7077 author Maciej W. Rozycki Fri, 06 Oct 2006 00:44:02 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:41 -0700 [PATCH] swarm: Actually initialize the IDE driver This is required for the SWARM GenBus IDE interface to be recognized. Signed-off-by: Maciej W. Rozycki Cc: Ralf Baechle Cc: Alan Cox Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 3260259f0084e51ce21503b130473b78871e7077 tree c553cd9d492b5dc11f33cb260da1f31dcd52ed62 parent 1662d32cea96a8711bd61094ff090979478f0fd4 author Henne Fri, 06 Oct 2006 00:44:01 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:41 -0700 [PATCH] sched: fix a kerneldoc error on is_init() Fix a kerneldoc warning and reorderd the description for is_init(). Signed-off-by: Henrik Kretzschmar Cc: "Randy.Dunlap" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1662d32cea96a8711bd61094ff090979478f0fd4 tree f6da100e63bbf225fefc1022bea61c76abc03eb8 parent a666ecfbf512dbd63a60f65d2ad6733a9a1b12ee author Jim Cromie Fri, 06 Oct 2006 00:43:59 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:41 -0700 [PATCH] MAINTAINERS: take over scx200-* and pc8736* drivers Add MAINTAINERS entries for new scx200_hrt and pc8736x_gpio drivers, and take over maintenance of scx200_gpio, authored by Christer Weinigel (which I've hacked at), who no longer has the hardware. Also take over hwmon/pc87360, authored by Jean Delvare, who's dropped maintenance to dedicate more time to hwmon subsystem. Signed-off-by: Jim Cromie Cc: Jean Delvare Cc: Christer Weinigel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a666ecfbf512dbd63a60f65d2ad6733a9a1b12ee tree 670d0bd90f424101a8f05639ff517e464c4005c6 parent dc366708b3b022050f139347a44c65a102e4835d author Jan Blunck Fri, 06 Oct 2006 00:43:58 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:41 -0700 [PATCH] Fix typo in "syntax error if percpu macros are incorrectly used" patch Trivial typo fix in the "syntax error if percpu macros are incorrectly used" patch. I misspelled "identifier" in all places. D'Oh! Thanks to Dirk Mueller to point this out. Signed-off-by: Jan Blunck Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc366708b3b022050f139347a44c65a102e4835d tree 35cf754c3a86a65fc95a5f5c440854abc5bf4ca4 parent 5e7c4ea83efa9d6269bcbf17611f83aeef71c096 author Al Viro Fri, 06 Oct 2006 00:43:58 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:41 -0700 [PATCH] m68k: dma_alloc_coherent() has gfp_t as the last argument annotate, fix the bogus argument of vmap() in it. Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 5e7c4ea83efa9d6269bcbf17611f83aeef71c096 tree 705a827fba1d17472fb11e9684c82eb5af0c05f2 parent 9ef308946fa8390136130a886b0d9a57867a747a author Roman Zippel Fri, 06 Oct 2006 00:43:57 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:41 -0700 [PATCH] m68k: fix NBPG define The recent header cleanup removed PAGE_SIZE from the exported information as it depends on the configuration. BTW This has possibly other consequences, as the core dump code is using PAGE_SIZE directly, which may need fixing as well. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 9ef308946fa8390136130a886b0d9a57867a747a tree f6a14e8639ae5b749a530fd2ce92ee66d9e69072 parent 6c04c28a656c1717fbe617efc40edabca3a85ca3 author Roman Zippel Fri, 06 Oct 2006 00:43:56 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:41 -0700 [PATCH] m68k: small system.h cleanup avoid unnecessary xchg() use in set_mb() Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 6c04c28a656c1717fbe617efc40edabca3a85ca3 tree b870cc9e976faa99b83f7820668818d7e42652a7 parent d6359fd783251238dbbf70b7c2fc745db25cf51f author Roman Zippel Fri, 06 Oct 2006 00:43:56 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:40 -0700 [PATCH] m68k: fix typo in __generic_copy_to_user Jump to the correct exit label after exception Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d6359fd783251238dbbf70b7c2fc745db25cf51f tree 8f11ac5e1770546be6ee56c344c3cff19fe58c5f parent 7236e978a3883406ca06ee79e0739743c7c92a85 author Roman Zippel Fri, 06 Oct 2006 00:43:55 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:40 -0700 [PATCH] m68k: cleanup string functions - cleanup asm of string functions - deinline strncat()/strncmp() - provide non-inlined strcpy() Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7236e978a3883406ca06ee79e0739743c7c92a85 tree 86b3f05dd67fe018c754ff75f04d3c875dfd08aa parent 7f7bbbe50b8a28f4dfaa4cea939ddb50198c4a99 author Roman Zippel Fri, 06 Oct 2006 00:43:54 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:40 -0700 [PATCH] provide tickadj define Provide a tickadj compatibility define for archs still using it. Signed-off-by: Roman Zippel Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 7f7bbbe50b8a28f4dfaa4cea939ddb50198c4a99 tree 6421bee762afd8f09c643e90860c4bdbe4dde93b parent 1ca4cb2418c04914e4661c059cf5b7b9262c645a author Benjamin Herrenschmidt Fri, 06 Oct 2006 00:43:53 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:40 -0700 [PATCH] page fault retry with NOPAGE_REFAULT Add a way for a no_page() handler to request a retry of the faulting instruction. It goes back to userland on page faults and just tries again in get_user_pages(). I added a cond_resched() in the loop in that later case. The problem I have with signal and spufs is an actual bug affecting apps and I don't see other ways of fixing it. In addition, we are having issues with infiniband and 64k pages (related to the way the hypervisor deals with some HV cards) that will require us to muck around with the MMU from within the IB driver's no_page() (it's a pSeries specific driver) and return to the caller the same way using NOPAGE_REFAULT. And to add to this, the graphics folks have been following a new approach of memory management that involves transparently swapping objects between video ram and main meory. To do that, they need installing PTEs from a no_page() handler as well and that also requires returning with NOPAGE_REFAULT. (For the later, they are currently using io_remap_pfn_range to install one PTE from no_page() which is a bit racy, we need to add a check for the PTE having already been installed afer taking the lock, but that's ok, they are only at the proof-of-concept stage. I'll send a patch adding a "clean" function to do that, we can use that from spufs too and get rid of the sparsemem hacks we do to create struct page for SPEs. Basically, that provides a generic solution for being able to have no_page() map hardware devices, which is something that I think sound driver folks have been asking for some time too). All of these things depend on having the NOPAGE_REFAULT exit path from no_page() handlers. Signed-off-by: Benjamin Herrenchmidt Cc: Hugh Dickins Cc: Nick Piggin Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 1ca4cb2418c04914e4661c059cf5b7b9262c645a tree add7a43542be686a552dfc48754a540fb721f811 parent da66b719d16f6ea3801b859c1ff35d5cd05c517d author Pekka Enberg Fri, 06 Oct 2006 00:43:52 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:40 -0700 [PATCH] slab: reduce numa text size Reduce the NUMA text size of mm/slab.o a little on x86 by using a local variable to store the result of numa_node_id(). text data bss dec hex filename 16858 2584 16 19458 4c02 mm/slab.o (before) 16804 2584 16 19404 4bcc mm/slab.o (after) [akpm@osdl.org: use better names] [pbadari@us.ibm.com: fix that] Cc: Christoph Lameter Signed-off-by: Pekka Enberg Signed-off-by: Badari Pulavarty Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit da66b719d16f6ea3801b859c1ff35d5cd05c517d tree 47c5fd1a4d9f9d6beb089b8129aea0f471e9930a parent efbc52f945696702a97a78b12812093f61880c2c author David Brownell Fri, 06 Oct 2006 00:43:51 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:40 -0700 [PATCH] ohci: don't play with IRQ regs This is a more correct fix for the way the ohci hcd was referencing pt_regs in the unlink paths. Signed-off-by: David Brownell Cc: Greg KH Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit efbc52f945696702a97a78b12812093f61880c2c tree 735c8a183345b7f6fb9eabee963bb744abbfadfa parent d69a892268c66c13fcb445a8274baa9d7befb7b5 author Andrew Morton Fri, 06 Oct 2006 00:43:50 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:40 -0700 [PATCH] irq_reqs: export __irq_regs Modules might want this. Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d69a892268c66c13fcb445a8274baa9d7befb7b5 tree bf8a7612f8dd0d759fae7b564c22bdd89d77b355 parent 4899b8b16b302299cc91289f7b5bac295e9ab387 author Andrew Morton Fri, 06 Oct 2006 00:43:49 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:39 -0700 [PATCH] Fix WARN_ON / WARN_ON_ONCE regression Tim and Ananiev report that the recent WARN_ON_ONCE changes cause increased cache misses with the tbench workload. Apparently due to the access to the newly-added static variable. Rearrange the code so that we don't touch that variable unless the warning is going to trigger. Also rework the logic so that the static variable starts out at zero, so we can move it into bss. It would seem logical to mark the static variable as __read_mostly too. But it would be wrong, because that would put it back into the vmlinux image, and the kernel will never read from this variable in normal operation anyway. Unless the compiler or hardware go and do some prefetching on us? For some reason this patch shrinks softirq.o text by 40 bytes. Cc: Tim Chen Cc: Herbert Xu Cc: "Ananiev, Leonid I" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 4899b8b16b302299cc91289f7b5bac295e9ab387 tree e9bfd4f3a44f6a49e60f1b8930a015c6772524ef parent d195412c35fe777811bd58ad43fba3aacc67e15c author Andrew Morton Fri, 06 Oct 2006 00:43:48 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:39 -0700 [PATCH] kauditd_thread warning fix Squash this warning: kernel/audit.c: In function 'kauditd_thread': kernel/audit.c:367: warning: no return statement in function returning non-void We might as test kthread_should_stop(), although it's not very pointful at present. The code which starts this thread looks racy - the kernel could start multiple threads. Cc: Al Viro Cc: Jeff Garzik Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d195412c35fe777811bd58ad43fba3aacc67e15c tree e360b4b84f6e70338072e183d850a94acd97563c parent 49f19ce401edfff937c448dd74c22497da361889 author Andrew Morton Fri, 06 Oct 2006 00:43:48 -0700 committer Linus Torvalds Fri, 06 Oct 2006 08:53:39 -0700 [PATCH] i386: irqs build fix Cc: David Howells Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit dc64bef5439c8e1fafea225054da4d8882c9d10c tree 9c95362518a769201c8cd1e92bc9e6243b7658de parent 2033b0c330d50d3f1cccd207147a10ad7f4f47f8 author Martin Schwidefsky Fri, 06 Oct 2006 16:38:48 +0200 committer Martin Schwidefsky Fri, 06 Oct 2006 16:38:48 +0200 [S390] Use CONFIG_GENERIC_TIME and define TOD clock source. Fix too slow clock by using CONFIG_GENERIC_TIME and adding a clock source for the s390 time-of-day clock. As added benefit we get rid of the s390 specific definition of do_gettimeofday and do_settimeofday. Signed-off-by: Martin Schwidefsky commit 2033b0c330d50d3f1cccd207147a10ad7f4f47f8 tree 1697ff00b8d9bc03421521c6335e11c5620afcaa parent 5a489b9846f688db7e69aa7ccb23c53459a9c20e author Heiko Carstens Fri, 06 Oct 2006 16:38:42 +0200 committer Martin Schwidefsky Fri, 06 Oct 2006 16:38:42 +0200 [PATCH] sysrq: irq change build fix. drivers/char/sysrq.c: In function `sysrq_handle_crashdump': drivers/char/sysrq.c:98: warning: implicit declaration of function `get_irq_regs' Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 5a489b9846f688db7e69aa7ccb23c53459a9c20e tree 1aaf8eb887f23bf65c25a70b50c9c83e5a1d2f31 parent 7e8ae7bfe8354b1f1b98c5cd29db8965ca1e6391 author Heiko Carstens Fri, 06 Oct 2006 16:38:35 +0200 committer Martin Schwidefsky Fri, 06 Oct 2006 16:38:35 +0200 [S390] irq change build fixes. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit 7e8ae7bfe8354b1f1b98c5cd29db8965ca1e6391 tree 3300b92f642fd69f77466a7f27e40afd2c2aa189 parent 2d103d5a80846e96e1cb1ba5e635e8c37d30ada8 author Cornelia Huck Fri, 06 Oct 2006 16:38:29 +0200 committer Martin Schwidefsky Fri, 06 Oct 2006 16:38:29 +0200 [S390] cio: 0 is a valid chpid. In order to determine chpid validity, we need to check whether the corresponding path is specified in the pim. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky commit 2d103d5a80846e96e1cb1ba5e635e8c37d30ada8 tree 30d3b14de570a33c251d56642df3969beb3994ea parent d83682b3971d6707d6d668b3b62d416ab7dd1ab3 author Melissa Howland Fri, 06 Oct 2006 16:38:26 +0200 committer Martin Schwidefsky Fri, 06 Oct 2006 16:38:26 +0200 [S390] monwriter buffer limit. Make max_bufs a global (per linux guest) limit. Signed-off-by: Melissa Howland Signed-off-by: Martin Schwidefsky commit d83682b3971d6707d6d668b3b62d416ab7dd1ab3 tree 552ef4e3cb878306f3010194856b667d4cfdb360 parent 49f19ce401edfff937c448dd74c22497da361889 author Christian Borntraeger Fri, 06 Oct 2006 16:38:22 +0200 committer Martin Schwidefsky Fri, 06 Oct 2006 16:38:22 +0200 [S390] ap bus poll thread priority. The ap bus is supposed to have a low priority. We must use 19 instead of -20, which is just the opposite. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit c1ce464d29e5bbf5819b2d7527b7d3030a6d65f1 tree bce7ed6d765c3cd7a75c4cbcccb25b62ed242966 parent 52aed7cd52ce8a1d576e26976c3950512e1af8b6 author Geoff Levand Thu, 05 Oct 2006 11:35:16 -0700 committer Paul Mackerras Fri, 06 Oct 2006 21:10:41 +1000 [POWERPC] Minor fix for bootargs property Avoid the use of an uninitialized stack variable when the powerpc device tree bootargs property is either missing or incorrectly defined. This also makes CONFIG_CMDLINE work properly under these conditions. This change adds a test for the existence of the bootargs property. early_init_dt_scan_chosen() tests for a zero length bootargs property in its CONFIG_CMDLINE processing, but the current implementation of of_get_flat_dt_prop() doesn't assign a value to the length when no property is found. Since an automatic variable is used, a stale value from the stack will be used in the test. Signed-off-by: Geoff Levand Signed-off-by: Paul Mackerras commit 52aed7cd52ce8a1d576e26976c3950512e1af8b6 tree 05fdd0726f44fc24ce67b2f7a0612b315365e9cb parent 3afbf5d6ef791be61d18329ae5302bbf1cd83723 author Anton Blanchard Fri, 06 Oct 2006 02:54:07 +1000 committer Paul Mackerras Fri, 06 Oct 2006 21:10:41 +1000 [POWERPC] Update MTFSF_L() comment David Woodhouse points out that the comment accompanying the MTFSF_L macro is misleading. We should make it clear that the L bit is ignored on older CPUS, not the entire instruction. Signed-off-by: Anton Blanchard Signed-off-by: Paul Mackerras commit 3afbf5d6ef791be61d18329ae5302bbf1cd83723 tree 2770bc827e656df1cb7c26906e376ac369e2b6e1 parent 41550c5128150175197257b6ceab2cd50dea7b51 author Brian King Thu, 05 Oct 2006 10:52:04 -0500 committer Paul Mackerras Fri, 06 Oct 2006 21:10:41 +1000 [POWERPC] Update pSeries defconfig for SATA Since the ipr driver now supports SATA and depends on libata, enable libata to get built. Signed-off-by: Brian King Signed-off-by: Paul Mackerras commit 41550c5128150175197257b6ceab2cd50dea7b51 tree 9406c5680e5e7fd49804fe95104453b272533f28 parent c998de146061db17787c1a31a3db1989f1341fdf author Benjamin Herrenschmidt Thu, 05 Oct 2006 16:40:41 +1000 committer Paul Mackerras Fri, 06 Oct 2006 21:10:41 +1000 [POWERPC] Don't get PCI IRQ from OF for devices with no IRQ This patch adds checking of the PCI_INTERRUPT_PIN register before using standard OF parsing to retreive PCI interrupts. The reason is that some PCI devices may have no PCI interrupt, though they may have interrupts attached via other means. In this case, we shall not use irq->pdev, but device-specific code can later retreive those interrupts instead. Without that patch, Maple and derivatives don't get the right interrupt for the second IDE channel as the linux IDE code fallsback to the PCI irq instead of trying to use the legacy ones for the on-board controller (which has no PCI_INTERRUPT_PIN). Having no PCI IRQ assign to it (as it doesn't request any) fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit c998de146061db17787c1a31a3db1989f1341fdf tree 65ca1488ea5ad8af8b19366d2fbbe73597323bb9 parent 9938c474f39e416091db9993954996266a3f2edf author Benjamin Herrenschmidt Thu, 05 Oct 2006 14:18:46 +1000 committer Paul Mackerras Fri, 06 Oct 2006 21:10:41 +1000 [POWERPC] Fix zImage decompress location The zImage wrapper has a "hack" that force the decompression to happen above 20Mb for 64 bits kernels, to work around issues with some firmwares on the field. However, the new wrapper has a bug which makes that hack not work properly. This fixes it. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 9938c474f39e416091db9993954996266a3f2edf tree 720211fdee04fead21f9f87ab541bfe50b35bb57 parent 74c37e8c9f626ed000388bebdc781a8e35ee4ab7 author Nathan Lynch Wed, 04 Oct 2006 22:28:00 -0500 committer Paul Mackerras Fri, 06 Oct 2006 21:10:41 +1000 [POWERPC] linux,tce-size property is 32 bits The "linux,tce-size" property is only 32 bits (see prom_initialize_tce_table() in arch/powerpc/kernel/prom_init.c). Treating it as an unsigned long in iommu_table_setparms() leads to access beyond the end of the property's buffer, so we pass garbage to the memset() in that function. [boot]0020 XICS Init i8259 legacy interrupt controller initialized [boot]0021 XICS Done PID hash table entries: 4096 (order: 12, 32768 bytes) cpu 0x0: Vector: 300 (Data Access) at [c0000000fe783850] pc: c000000000035e90: .memset+0x60/0xfc lr: c000000000044fa4: .iommu_table_setparms+0xb0/0x158 sp: c0000000fe783ad0 msr: 9000000000009032 dar: c000000100000000 dsisr: 42010000 current = 0xc00000000450e810 paca = 0xc000000000411580 pid = 1, comm = swapper enter ? for help [link register ] c000000000044fa4 .iommu_table_setparms+0xb0/0x158 [c0000000fe783ad0] c000000000044f4c .iommu_table_setparms+0x58/0x158 (unreliable) [c0000000fe783b70] c00000000004529c .iommu_bus_setup_pSeries+0x1c4/0x254 [c0000000fe783c00] c00000000002b8ac .do_bus_setup+0x3c/0xe4 [c0000000fe783c80] c00000000002c924 .pcibios_fixup_bus+0x64/0xd8 [c0000000fe783d00] c0000000001a2d5c .pci_scan_child_bus+0x6c/0x10c [c0000000fe783da0] c00000000002be28 .scan_phb+0x17c/0x1b4 [c0000000fe783e40] c0000000003cfa00 .pcibios_init+0x58/0x19c [c0000000fe783ec0] c0000000000094b4 .init+0x1e8/0x3d8 [c0000000fe783f90] c000000000026e54 .kernel_thread+0x4c/0x68 Signed-off-by: Nathan Lynch Acked-by: Olof Johansson Signed-off-by: Paul Mackerras commit 74c37e8c9f626ed000388bebdc781a8e35ee4ab7 tree 419a1a03e8267523d53140aac39510f28a97b93f parent 13a2eea1461f5d54cc5d58334fbde4bf4cc9cb23 author Timur Tabi Wed, 04 Oct 2006 11:03:44 -0500 committer Paul Mackerras Fri, 06 Oct 2006 21:10:40 +1000 [POWERPC] Add DTS for MPC8349E-mITX board Add the DTS for the Freescale MPC 8349E-mITX reference board. Contact Vitesse for the driver for the VSC 7385. Signed-off-by: Timur Tabi Signed-off-by: Paul Mackerras commit 13a2eea1461f5d54cc5d58334fbde4bf4cc9cb23 tree 8abddbfbc8b80c911ed6e82dc1678b9ca542c93f parent 3211be5c6a61946c75318069611699c90b10e0f8 author Nick Piggin Wed, 04 Oct 2006 17:25:44 +0200 committer Paul Mackerras Fri, 06 Oct 2006 21:10:40 +1000 [POWERPC] Fix harmless typo Fix a typo. Noticed by the unlikely profiler. Signed-off-by: Nick Piggin Signed-off-by: Paul Mackerras commit 3211be5c6a61946c75318069611699c90b10e0f8 tree eb88f097641788dfea4d4a8f6475293a1b010777 parent 49f19ce401edfff937c448dd74c22497da361889 author Paul Mackerras Fri, 06 Oct 2006 21:09:40 +1000 committer Paul Mackerras Fri, 06 Oct 2006 21:09:40 +1000 [PPC] Fix some irq breakage with ARCH=ppc Signed-off-by: Paul Mackerras commit 49f19ce401edfff937c448dd74c22497da361889 tree 3c657340fd3a34fcff516bbf09c4d72f5e141c7b parent 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 author Olof Johansson Thu, 05 Oct 2006 20:31:10 -0500 committer Linus Torvalds Thu, 05 Oct 2006 18:39:04 -0700 [PATCH] powerpc: irq change build breaks Fix up some of the buildbreaks from the irq handler changes. Signed-off-by: Olof Johansson Signed-off-by: Linus Torvalds commit 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 tree d0536e4da737900fa27b235f175a3d179d692200 parent 46767aeba58ca9357a2309765201bad38d8f5e9b parent 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 author Jeff Garzik Thu, 05 Oct 2006 21:03:43 -0400 committer Jeff Garzik Thu, 05 Oct 2006 21:03:43 -0400 Merge branch 'master' into upstream-fixes commit 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 tree 93824f573767da634fbc82c388b6d33cc454212b parent c1a26e7d40fb814716950122353a1a556844286b parent 7d12e780e003f93433d49ce78cfedf4b4c52adc5 author Linus Torvalds Thu, 05 Oct 2006 16:32:01 -0700 committer Linus Torvalds Thu, 05 Oct 2006 16:32:01 -0700 Merge git://git.infradead.org/~dhowells/irq-2.6 * git://git.infradead.org/~dhowells/irq-2.6: IRQ: Maintain regs pointer globally rather than passing to IRQ handlers IRQ: Typedef the IRQ handler function type IRQ: Typedef the IRQ flow handler function type commit c1a26e7d40fb814716950122353a1a556844286b tree 51d317e7575ddd319560abb4c29d6ef91520864f parent 4b0ff1a94cba36a35734c84f377e49cacc77f293 author Peter Osterlund Thu, 05 Oct 2006 21:17:50 +0200 committer Linus Torvalds Thu, 05 Oct 2006 16:18:55 -0700 [PATCH] UDF: Fix mounting read-write The UDF filesystem can't be mounted in read-write mode any more, because of forgotten braces. Signed-off-by: Peter Osterlund [ Duh! ] Signed-off-by: Linus Torvalds commit 4b0ff1a94cba36a35734c84f377e49cacc77f293 tree 2a6e34c531948d1bc9749a31fb6a88e284ecdb1f parent e03508b43fd93410c1abda2eeabe021de8461f95 author Randy Dunlap Thu, 05 Oct 2006 19:07:26 +0200 committer Linus Torvalds Thu, 05 Oct 2006 15:55:15 -0700 [PATCH] x86-64: Fix compilation without CONFIG_KALLSYMS Include linux/kallsyms.h unconditionally for print_symbol(). Signed-off-by: Randy Dunlap Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds commit e03508b43fd93410c1abda2eeabe021de8461f95 tree 4e06ae2ce0e6a0c5c93a8ad79322ff53a11fc874 parent d7a297baa6edea94167163bed808c6a8933bd5aa parent 88271e9e43e65537c6390af3718a60c45c787e8f author Linus Torvalds Thu, 05 Oct 2006 15:51:43 -0700 committer Linus Torvalds Thu, 05 Oct 2006 15:54:07 -0700 Merge branch 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6 * 'for-linus' of git://one.firstfloor.org/home/andi/git/linux-2.6: [PATCH] i386: fix rwsem build bug on CONFIG_M386=y [PATCH] x86-64: Annotate interrupt frame backlink in interrupt handlers [PATCH] x86-64: Fix FPU corruption [PATCH] x86: Terminate the kernel stacks for the unwinder [PATCH] i386: Fix PCI BIOS config space access [PATCH] x86-64: Calgary IOMMU: print PCI bus numbers in hex [PATCH] x86-64: Calgary IOMMU: Update Jon's contact info [PATCH] x86-64: Calgary IOMMU: Fix off by one when calculating register space location [PATCH] x86-64: Calgary IOMMU: deobfuscate calgary_init [PATCH] i386: Update defconfig [PATCH] x86-64: Update defconfig [ Manually skipped commits that incorrectly ignored AC in kernel space. The alignment fault is defined to only happen for CPL3 anyway - Linus ] commit d7a297baa6edea94167163bed808c6a8933bd5aa tree b703dc50266304765eaa14753a5ba4616d340199 parent d223a60106891bfe46febfacf46b20cd8509aaad author Frederik Deweerdt Thu, 05 Oct 2006 20:49:18 +0000 committer Linus Torvalds Thu, 05 Oct 2006 15:49:02 -0700 [PATCH] fix qla{2,4} build error commit 0181944fe647cae18d545ac1167df3d15d393701 adds a 'extended_error_logging' global variable to qla2xxx which is defined by qla4xxx too. Trying to build both drivers results in the following error: LD drivers/scsi/built-in.o drivers/scsi/qla4xxx/built-in.o: In function `qla4xxx_slave_configure': drivers/scsi/qla4xxx/ql4_os.c:1433: multiple definition of `extended_error_logging' drivers/scsi/qla2xxx/built-in.o:drivers/scsi/qla2xxx/qla_os.c:2166: first defined here make[2]: *** [drivers/scsi/built-in.o] Error 1 make[1]: *** [drivers/scsi] Error 2 make: *** [drivers] Error 2 The following patch simply adds a qla2_ (qla4_ respectively) prefix to the variable name. Signed-off-by: Frederik Deweerdt Signed-off-by: Linus Torvalds commit 88271e9e43e65537c6390af3718a60c45c787e8f tree b5c84887d1de93bb9366181f07033e74bda10319 parent 7d0b0e8ddbdda58a852ccff010c0339a38552cc7 author Ingo Molnar Thu, 05 Oct 2006 18:47:22 +0200 committer Andi Kleen Thu, 05 Oct 2006 18:47:22 +0200 [PATCH] i386: fix rwsem build bug on CONFIG_M386=y CONFIG_M386 turns on spinlock-based generic rwsems - which surprises the semaphore.S rwsem stubs. Tested both with and without CONFIG_M386. Reported-by: Klaus Knopper Triaged-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Andi Kleen commit 7d0b0e8ddbdda58a852ccff010c0339a38552cc7 tree b3bbe80bbcc38f5ee07b6b235f4bf1fd210e5efe parent 0a5ace2ab08d45cd78d7ef0067cdcd5c812ac54f author Andi Kleen Thu, 05 Oct 2006 18:47:22 +0200 committer Andi Kleen Thu, 05 Oct 2006 18:47:22 +0200 [PATCH] x86-64: Annotate interrupt frame backlink in interrupt handlers Add correct CFI annotation to the backlink on top of the interrupt stack. Signed-off-by: Andi Kleen commit 0a5ace2ab08d45cd78d7ef0067cdcd5c812ac54f tree a4da5e79010de2391ee92d6a71b2a7217ed68d61 parent 51ec28e1b2cb267a09a0b8eac1ccf8d61b7268bf author Andi Kleen Thu, 05 Oct 2006 18:47:22 +0200 committer Andi Kleen Thu, 05 Oct 2006 18:47:22 +0200 [PATCH] x86-64: Fix FPU corruption This reverts an earlier patch that was found to cause FPU state corruption. I think the corruption happens because unlazy_fpu() can cause FPU exceptions and when it happens after the current switch some processing would affect the state in the wrong process. Thanks to Douglas Crosher and Tom Hughes for testing. Cc: jbeulich@novell.com Signed-off-by: Andi Kleen commit 51ec28e1b2cb267a09a0b8eac1ccf8d61b7268bf tree 4686d439a49b98b98fc5048641ddfb50db3fbcd6 parent f015c6c4d733f68cbc1c5d231bb158abaa5c9606 author Andi Kleen Thu, 05 Oct 2006 18:47:22 +0200 committer Andi Kleen Thu, 05 Oct 2006 18:47:22 +0200 [PATCH] x86: Terminate the kernel stacks for the unwinder Always make sure RIP/EIP is 0 in the registers stored on the top of the stack of a kernel thread. This makes sure the unwinder code won't try a fallback but knows the stack has ended. AK: this patch is a bit mysterious. in theory they should be terminated anyways, but it seems to fix at least one crash. Anyways double termination probably doesn't hurt. Signed-off-by: Andi Kleen commit f015c6c4d733f68cbc1c5d231bb158abaa5c9606 tree 9ffa7a284f8265723bf46cb19557443bf1e68ea2 parent 70d666d6ae9724c0a08434c20f8830c90a635bd3 author Andi Kleen Thu, 05 Oct 2006 18:47:22 +0200 committer Andi Kleen Thu, 05 Oct 2006 18:47:22 +0200 [PATCH] i386: Fix PCI BIOS config space access Got broken by a earlier change. Also add a printk when no pci config method could be found. Cc: gregkh@suse.de Signed-off-by: Andi Kleen commit 70d666d6ae9724c0a08434c20f8830c90a635bd3 tree 0bea7aa1faf6b7392979e4980f3628653c44bbd6 parent d8d2bedf6002bf40b07fc5989dd9dbe56609fe3e author Jon Mason Thu, 05 Oct 2006 18:47:21 +0200 committer Andi Kleen Thu, 05 Oct 2006 18:47:21 +0200 [PATCH] x86-64: Calgary IOMMU: print PCI bus numbers in hex Make the references to the bus number in hex instead of decimal, as that is the way that lspci prints out the bus numbers. Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit d8d2bedf6002bf40b07fc5989dd9dbe56609fe3e tree 1f7894af36db0508df4998f74d06577ed6545537 parent 76fd231717453e06347ad17b3fc1707c6918d172 author Jon Mason Thu, 05 Oct 2006 18:47:21 +0200 committer Andi Kleen Thu, 05 Oct 2006 18:47:21 +0200 [PATCH] x86-64: Calgary IOMMU: Update Jon's contact info Also add copyright for work done after leaving IBM. Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit 76fd231717453e06347ad17b3fc1707c6918d172 tree eb6178d9604a352a6603294478d740cb64986936 parent dedc9937e876cb5430bca6a1dccfcc2ff22f8b7c author Jon Mason Thu, 05 Oct 2006 18:47:21 +0200 committer Andi Kleen Thu, 05 Oct 2006 18:47:21 +0200 [PATCH] x86-64: Calgary IOMMU: Fix off by one when calculating register space location The purpose of the code being modified is to determine the location of the calgary chip address space. This is done by a magical formula of FE0MB-8MB*OneBasedChassisNumber+1MB*(RioNodeId-ChassisBase) to find the offset where BIOS puts it. In this formula, OneBasedChassisNumber corresponds to the NUMA node, and rionodeid is always 2 or 3 depending on which chip in the system it is. The problem was that we had an off by one error that caused us to account some busses to the wrong chip and thus give them the wrong address space. Fixes RH bugzilla #203971. Signed-off-by: Jon Mason Signed-off-bu: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit dedc9937e876cb5430bca6a1dccfcc2ff22f8b7c tree befdff79af02b30ba42cfdb983343ea7ec7b363f parent 814eadcefe79a2977a11ba135c4763a402112746 author Jon Mason Thu, 05 Oct 2006 18:47:21 +0200 committer Andi Kleen Thu, 05 Oct 2006 18:47:21 +0200 [PATCH] x86-64: Calgary IOMMU: deobfuscate calgary_init calgary_init's for loop does not correspond to the actual device being checked, which makes its upperbound check for array overflow useless. Changing this to a do-while loop is the correct way of doing this. There should be no possibility of spinning forever in this loop, as pci_get_device states that it will go through all iterations, then return NULL (thus breaking the loop). Signed-off-by: Jon Mason Signed-off-by: Muli Ben-Yehuda Signed-off-by: Andi Kleen commit 814eadcefe79a2977a11ba135c4763a402112746 tree 133a1f41a82ae07312da95c2f70e98b91c49ae09 parent a7441a39a3c62addd6ce10497c101057f4d69184 author Andi Kleen Thu, 05 Oct 2006 18:47:21 +0200 committer Andi Kleen Thu, 05 Oct 2006 18:47:21 +0200 [PATCH] i386: Update defconfig Signed-off-by: Andi Kleen commit a7441a39a3c62addd6ce10497c101057f4d69184 tree 734fe76efc1b9d27a7a635bd7160522193dc16a1 parent d223a60106891bfe46febfacf46b20cd8509aaad author Andi Kleen Thu, 05 Oct 2006 18:47:21 +0200 committer Andi Kleen Thu, 05 Oct 2006 18:47:21 +0200 [PATCH] x86-64: Update defconfig Signed-off-by: Andi Kleen commit 7d12e780e003f93433d49ce78cfedf4b4c52adc5 tree 6748550400445c11a306b132009f3001e3525df8 parent da482792a6d1a3fbaaa25fae867b343fb4db3246 author David Howells Thu, 05 Oct 2006 14:55:46 +0100 committer David Howells Thu, 05 Oct 2006 15:10:12 +0100 IRQ: Maintain regs pointer globally rather than passing to IRQ handlers Maintain a per-CPU global "struct pt_regs *" variable which can be used instead of passing regs around manually through all ~1800 interrupt handlers in the Linux kernel. The regs pointer is used in few places, but it potentially costs both stack space and code to pass it around. On the FRV arch, removing the regs parameter from all the genirq function results in a 20% speed up of the IRQ exit path (ie: from leaving timer_interrupt() to leaving do_IRQ()). Where appropriate, an arch may override the generic storage facility and do something different with the variable. On FRV, for instance, the address is maintained in GR28 at all times inside the kernel as part of general exception handling. Having looked over the code, it appears that the parameter may be handed down through up to twenty or so layers of functions. Consider a USB character device attached to a USB hub, attached to a USB controller that posts its interrupts through a cascaded auxiliary interrupt controller. A character device driver may want to pass regs to the sysrq handler through the input layer which adds another few layers of parameter passing. I've build this code with allyesconfig for x86_64 and i386. I've runtested the main part of the code on FRV and i386, though I can't test most of the drivers. I've also done partial conversion for powerpc and MIPS - these at least compile with minimal configurations. This will affect all archs. Mostly the changes should be relatively easy. Take do_IRQ(), store the regs pointer at the beginning, saving the old one: struct pt_regs *old_regs = set_irq_regs(regs); And put the old one back at the end: set_irq_regs(old_regs); Don't pass regs through to generic_handle_irq() or __do_IRQ(). In timer_interrupt(), this sort of change will be necessary: - update_process_times(user_mode(regs)); - profile_tick(CPU_PROFILING, regs); + update_process_times(user_mode(get_irq_regs())); + profile_tick(CPU_PROFILING); I'd like to move update_process_times()'s use of get_irq_regs() into itself, except that i386, alone of the archs, uses something other than user_mode(). Some notes on the interrupt handling in the drivers: (*) input_dev() is now gone entirely. The regs pointer is no longer stored in the input_dev struct. (*) finish_unlinks() in drivers/usb/host/ohci-q.c needs checking. It does something different depending on whether it's been supplied with a regs pointer or not. (*) Various IRQ handler function pointers have been moved to type irq_handler_t. Signed-Off-By: David Howells (cherry picked from 1b16e7ac850969f38b375e511e3fa2f474a33867 commit) commit da482792a6d1a3fbaaa25fae867b343fb4db3246 tree 138c187e669bbaf997780a999299fbc977568e1c parent 57a58a9435aef3e0342ba4b2c97e0ddfea6f2c7f author David Howells Thu, 05 Oct 2006 13:06:34 +0100 committer David Howells Thu, 05 Oct 2006 13:28:27 +0100 IRQ: Typedef the IRQ handler function type Typedef the IRQ handler function type. Signed-Off-By: David Howells (cherry picked from 1356d1e5fd256997e3d3dce0777ab787d0515c7a commit) commit 57a58a9435aef3e0342ba4b2c97e0ddfea6f2c7f tree 35603f6385edf3dcd20e80a2fcf4c66c7cdc34a7 parent d223a60106891bfe46febfacf46b20cd8509aaad author David Howells Thu, 05 Oct 2006 13:06:34 +0100 committer David Howells Thu, 05 Oct 2006 13:28:06 +0100 IRQ: Typedef the IRQ flow handler function type Typedef the IRQ flow handler function type. Signed-Off-By: David Howells (cherry picked from 8e973fbdf5716b93a0a8c0365be33a31ca0fa351 commit) commit 2f614fe04f4463ff22234133319067d7361f54e5 tree 136b00e488510b16c3b2118d9a221f4103b10c27 parent 39984a9fad0c642182f426d7771332d46f222103 author Jeff Garzik Thu, 05 Oct 2006 07:10:38 -0400 committer Jeff Garzik Thu, 05 Oct 2006 07:10:38 -0400 [netdrvr] b44: handle excessive multicast groups If there are more than B44_MCAST_TABLE_SIZE groups in the dev->mc_list, it will only listen to the first B44_MCAST_TABLE_SIZE that it sees. This change makes the driver go into RXCONFIG_ALLMULTI mode if there are more than B44_MCAST_TABLE_SIZE groups being subscribed to, similar to other network drivers. Noticed by Bill Helfinstine Signed-off-by: Jeff Garzik commit 39984a9fad0c642182f426d7771332d46f222103 tree c57cec6ca1411d276fe959535b2b116167b11314 parent 0a07bc645e818b88559d99f52ad45e35352e8228 author Karsten Keil Fri, 29 Sep 2006 23:28:42 -0700 committer Jeff Garzik Thu, 05 Oct 2006 07:01:25 -0400 [PATCH] bonding: fix deadlock on high loads in bond_alb_monitor() In bond_alb_monitor the bond->curr_slave_lock write lock is taken and then dev_set_promiscuity maybe called which can take some time, depending on the network HW. If a network IRQ for this card come in the softirq handler maybe try to deliver more packets which end up in a request to the read lock of bond->curr_slave_lock -> deadlock. This issue was found by a test lab during network stress tests, this patch disable the softirq handler for this case and solved the issue. Signed-off-by: Karsten Keil Acked-by: Jay Vosburgh Signed-off-by: Jeff Garzik commit 46767aeba58ca9357a2309765201bad38d8f5e9b tree 8274aafaf9c3e2232c12493fd1a79cb9483f6f90 parent d223a60106891bfe46febfacf46b20cd8509aaad author Alan Cox Fri, 29 Sep 2006 18:26:47 +0100 committer Jeff Garzik Thu, 05 Oct 2006 06:55:00 -0400 [PATCH] libata: Don't believe bogus claims in the older PIO mode register Signed-off-by: Alan Cox Signed-off-by: Jeff Garzik commit 0a07bc645e818b88559d99f52ad45e35352e8228 tree c7c2c5ed96cd2df1b723c977e3eaef6672e60b9e parent 70fbf32703a9c4d3403663d1fc24fd8afc76d56f author Peter Zijlstra Tue, 19 Sep 2006 14:55:22 +0200 committer Jeff Garzik Thu, 05 Oct 2006 06:48:25 -0400 [PATCH] forcedeth: hardirq lockdep warning BUG: warning at kernel/lockdep.c:1816/trace_hardirqs_on() (Not tainted) Call Trace: show_trace dump_stack trace_hardirqs_on :forcedeth:nv_nic_irq_other handle_IRQ_event __do_IRQ do_IRQ ret_from_intr DWARF2 barf default_idle cpu_idle rest_init start_kernel _sinittext These 3 functions nv_nic_irq_tx(), nv_nic_irq_rx() and nv_nic_irq_other() are reachable from IRQ context and process context. Make use of the irq-save/restore spinlock variant. (Compile tested only, since I do not have the hardware) Signed-off-by: Peter Zijlstra Cc: Jeff Garzik Cc: Ingo Molnar Cc: Arjan van de Ven Cc: Dave Jones Cc: Andrew Morton Signed-off-by: Jeff Garzik commit 70fbf32703a9c4d3403663d1fc24fd8afc76d56f tree 7d15c14bc89a2d04288d83393fc7b7b4cb098c22 parent 751ae21c6cd1493e3d0a4935b08fb298b9d89773 author Maxime Bizon Tue, 03 Oct 2006 10:27:10 -0700 committer Jeff Garzik Thu, 05 Oct 2006 06:43:24 -0400 [PATCH] mv643xx_eth: Fix ethtool stats Some stats reported by ethtool -S on mv643xx_eth device are cleared between each call. This patch fixes it. Signed-off-by: Maxime Bizon Signed-off-by: Dale Farnsworth Signed-off-by: Jeff Garzik commit 751ae21c6cd1493e3d0a4935b08fb298b9d89773 tree f0cd58c2c357101b6f6cf610221cceca3f6eef9c parent 03a85d0907b2455c772b8fb179b0c07a66b00ddb author Santiago Leon Tue, 03 Oct 2006 12:24:45 -0500 committer Jeff Garzik Thu, 05 Oct 2006 06:43:24 -0400 [PATCH] ibmveth: fix int rollover panic This patch fixes a nasty bug that has been sitting there since the very first versions of the driver, but is generating a panic because we changed the number of 2K buffers for 2.6.16. The consumer_index and producer_index are u32's that get incremented on every buffer emptied and replenished respectively. We use the {producer,consumer}_index mod'ed with the size of the pool to pick out an entry in the free_map. The problem happens when the u32 rolls over and the number of the buffers in the pool is not a perfect divisor of 2^32. i.e. if the number of 2K buffers is 0x300, before the consumer_index rolls over, our index to the free map = 0xffffffff mod 0x300 = 0xff. The next time a buffer is emptied, we want the index to the free map to be 0x100, but 0x0 mod 0x300 is 0x0. This patch assigns the mod'ed result back to the consumer and producer indexes so that they never roll over. The second chunk of the patch covers the unlikely case where the consumer_index has just been reset to 0x0 and the hypervisor is not able to accept that buffer. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 03a85d0907b2455c772b8fb179b0c07a66b00ddb tree 7fdd36057604315737d6c14e590eec6ceb6be687 parent 4347ef15f76dca33ae8da769d6900a468253bda2 author Santiago Leon Tue, 03 Oct 2006 12:24:39 -0500 committer Jeff Garzik Thu, 05 Oct 2006 06:43:23 -0400 [PATCH] ibmveth: rename proc entry name This patch changes the name of the proc file for each ibmveth adapter from the network device name to the slot number in the virtual bus. The proc file is created when the device is probed, so a change in the name of the device will not be reflected in the name of the proc file giving problems when identifying and removing the adapter. The slot number is a property that does not change through the life of the adapter so we use that instead. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 4347ef15f76dca33ae8da769d6900a468253bda2 tree d4453425aa3fe5f066a2a742fb9eafd2571c2091 parent 6b4223748895ed5b200c8049231567ea399fc0c2 author Santiago Leon Tue, 03 Oct 2006 12:24:34 -0500 committer Jeff Garzik Thu, 05 Oct 2006 06:43:23 -0400 [PATCH] ibmveth: kdump interrupt fix This patch fixes a race that panics the kernel when opening the device after a kdump. Without this patch there is a window where the hypervisor can send an interrupt before all the structures for the kdump ibmveth module are ready (because the hypervisor is not aware that the partition crashed and that the virtual driver is reloading). We close this window by disabling the interrupts before registering the adapter to the hypervisor. This patch depends on the "ibmveth: Harden driver initilisation" patch. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 6b4223748895ed5b200c8049231567ea399fc0c2 tree 451cfcc084a6529c4ffbe57be9ed89e8186c7219 parent bbedefccc6b0da43cfaf785dac89c88bc59cb6ed author Santiago Leon Tue, 03 Oct 2006 12:24:28 -0500 committer Jeff Garzik Thu, 05 Oct 2006 06:43:23 -0400 [PATCH] ibmveth: Add netpoll function This patch adds the net poll controller function to ibmveth to support netconsole and netdump. Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit bbedefccc6b0da43cfaf785dac89c88bc59cb6ed tree 331fe1b4cd7eab50f7f20254d93d30558b67d1eb parent 489b10c1f63fafcb89c330a0603694652068132a author Michael Ellerman Tue, 03 Oct 2006 12:24:23 -0500 committer Jeff Garzik Thu, 05 Oct 2006 06:43:23 -0400 [PATCH] ibmveth: Harden driver initilisation This patch has been floating around for a while now, Santi originally sent it in March: http://www.spinics.net/lists/netdev/msg00471.html After a kexec the ibmveth driver will fail when trying to register with the Hypervisor because the previous kernel has not unregistered. So if the registration fails, we unregister and then try again. We don't unconditionally unregister, because we don't want to disturb the regular code path for 99% of users. Signed-off-by: Michael Ellerman Acked-by: Anton Blanchard Signed-off-by: Santiago Leon Signed-off-by: Jeff Garzik commit 489b10c1f63fafcb89c330a0603694652068132a tree d63a874a197e67c64c96137efd2cd55d1947eaa9 parent d223a60106891bfe46febfacf46b20cd8509aaad author Stephen Hemminger Tue, 03 Oct 2006 16:39:12 -0700 committer Jeff Garzik Thu, 05 Oct 2006 06:43:23 -0400 [PATCH] sky2: incorrect length on receive packets The previous change to do fragmented receive (post 2.6.18) introduced a bug where packets are passed up with size set to the size of the receive buffer not the actual received data. IP silently trims this so it didn't show up right away. Signed-off-by: Stephen Hemminger Signed-off-by: Jeff Garzik