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 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 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 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)