commit 1f4d4a7e8f5a46929a987ec17987dbbdd73029d4 tree 7925980f6295e6f3aba704f08837b03bf3578838 parent 938473b24636d77dc5e9c3f41090d071b6cf4389 parent 46b304934de417a2238d659ef6459a74cb3f5e6b author Linus Torvalds Sat, 10 Jun 2006 11:03:51 -0700 committer Linus Torvalds Sat, 10 Jun 2006 11:03:51 -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: [SPARC64]: Avoid JBUS errors on some Niagara systems. [FUSION]: Fix mptspi.c build with CONFIG_PM not set. [TG3]: Handle Sun onboard tg3 chips more correctly. [SPARC64]: Dump local cpu registers in sun4v_log_error() commit 938473b24636d77dc5e9c3f41090d071b6cf4389 tree 0a4146d723f52a87b7ec296227748da2ee1b677a parent 57a62fed871eb2a95f296fe6c5c250ce21b81a79 author Milton Miller Sat, 10 Jun 2006 09:54:16 -0700 committer Linus Torvalds Sat, 10 Jun 2006 11:02:05 -0700 [PATCH] powerpc: console_initcall ordering issues From: Milton Miller The add_preferred_console call in rtas_console.c was not causing the console to be selected. It turns out that the add_preferred_console was being called after the hvc_console driver was registered. It only works when it is called before the console driver is registered. Reorder hvc_console.o after the hvc_console drivers to allow the selection during console_initcall processing. Signed-off-by: Milton Miller Signed-off-by: Anton Blanchard Cc: Paul Mackerras Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 57a62fed871eb2a95f296fe6c5c250ce21b81a79 tree 0e399966d58f7177e1c34a765e768e0865fc5813 parent a913f50706b21c7933f53cec678bb9a1c2383499 author Markus Lidel Sat, 10 Jun 2006 09:54:14 -0700 committer Linus Torvalds Sat, 10 Jun 2006 11:02:05 -0700 [PATCH] I2O: Bugfixes to get I2O working again From: Markus Lidel - Fixed locking of struct i2o_exec_wait in Executive-OSM - Removed LCT Notify in i2o_exec_probe() which caused freeing memory and accessing freed memory during first enumeration of I2O devices - Added missing locking in i2o_exec_lct_notify() - removed put_device() of I2O controller in i2o_iop_remove() which caused the controller structure get freed to early - Fixed size of mempool in i2o_iop_alloc() - Fixed access to freed memory in i2o_msg_get() See http://bugzilla.kernel.org/show_bug.cgi?id=6561 Signed-off-by: Markus Lidel Cc: Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a913f50706b21c7933f53cec678bb9a1c2383499 tree 4899980dac61984ea659eb878304a10868aa1b8f parent 670bd95e0413c43f878b73a4a3919d1f452a4157 author Andrew Morton Sat, 10 Jun 2006 09:54:13 -0700 committer Linus Torvalds Sat, 10 Jun 2006 11:02:05 -0700 [PATCH] powernow-k8 crash workaround From: Andrew Morton Work around the oops reported in http://bugzilla.kernel.org/show_bug.cgi?id=6478. Thanks to Ralf Hildebrandt for testing and reporting. Acked-by: Dave Jones Cc: "Brown, Len" Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 670bd95e0413c43f878b73a4a3919d1f452a4157 tree db7b05810c5cc61c89b856996174e31147611cba parent d90d2c385d4d832428d1e51c2a7edeef39c822f5 author David Howells Sat, 10 Jun 2006 09:54:12 -0700 committer Linus Torvalds Sat, 10 Jun 2006 11:02:05 -0700 [PATCH] Further alterations for memory barrier document From: David Howells Apply some alterations to the memory barrier document that I worked out with Paul McKenney of IBM, plus some of the alterations suggested by Alan Stern. The following changes were made: (*) One of the examples given for what can happen with overlapping memory barriers was wrong. (*) The description of general memory barriers said that a general barrier is a combination of a read barrier and a write barrier. This isn't entirely true: it implies both, but is more than a combination of both. (*) The first example in the "SMP Barrier Pairing" section was wrong: the loads around the read barrier need to touch the memory locations in the opposite order to the stores around the write barrier. (*) Added a note to make explicit that the loads should be in reverse order to the stores. (*) Adjusted the diagrams in the "Examples Of Memory Barrier Sequences" section to make them clearer. Added a couple of diagrams to make it more clear as to how it could go wrong without the barrier. (*) Added a section on memory speculation. (*) Dropped any references to memory allocation routines doing memory barriers. They may do sometimes, but it can't be relied on. This may be worthy of further documentation later. (*) Made the fact that a LOCK followed by an UNLOCK should not be considered a full memory barrier more explicit and gave an example. Signed-off-by: David Howells Acked-by: Paul E. McKenney Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d90d2c385d4d832428d1e51c2a7edeef39c822f5 tree 979edd96372170564f8b0f9b2e230dc0cde85794 parent 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 parent 133dda1e4f757e036fa838cba6804d0344931c4a author Linus Torvalds Sat, 10 Jun 2006 10:59:39 -0700 committer Linus Torvalds Sat, 10 Jun 2006 10:59:39 -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: [PATCH] powerpc: Fix cell blade detection [PATCH] powerpc: Fix call to ibm,client-architecture-support powerpc: Fix machine check problem on 32-bit kernels commit 46b304934de417a2238d659ef6459a74cb3f5e6b tree 770b99e2723170f237d9159541484bba7dec21e8 parent c29ca9d1812f2abacaefa7daa31e085600128938 author David S. Miller Sat, 10 Jun 2006 01:06:25 -0700 committer David S. Miller Sat, 10 Jun 2006 01:06:25 -0700 [SPARC64]: Avoid JBUS errors on some Niagara systems. Doing PCI config space accesses to non-present PCI slots can result in fatal JBUS errors if the PCI config access hypervisor call is performed on cpus other than the boot cpu. PCI config space accesses to present PCI slots works just fine. Recursively traverse the OBP device tree under the PCI controller node and record all present device IDs into a small hash table. Avoid the hypervisor call for any PCI config space access attempt for a device not recorded in the hash table. Signed-off-by: David S. Miller commit c29ca9d1812f2abacaefa7daa31e085600128938 tree 31a68e2ee2c831d7fa098db0495ac19d6a7b38a9 parent f49639e643e69ff233b14966b8d48541d2e17517 author Tom "spot" Callaway Fri, 09 Jun 2006 17:01:48 -0700 committer David S. Miller Fri, 09 Jun 2006 17:01:48 -0700 [FUSION]: Fix mptspi.c build with CONFIG_PM not set. Signed-off-by: Tom "spot" Callaway Signed-off-by: David S. Miller commit f49639e643e69ff233b14966b8d48541d2e17517 tree 8faeabd3bfc855f0a0a5a5a37d9fdbeed27a3f20 parent 5224e6cc3ab5ae03895bbb67f4a26ce72e62ce58 author David S. Miller Fri, 09 Jun 2006 11:58:36 -0700 committer David S. Miller Fri, 09 Jun 2006 12:03:51 -0700 [TG3]: Handle Sun onboard tg3 chips more correctly. Get rid of all the SUN_570X logic and instead: 1) Make sure MEMARB_ENABLE is set when we probe the SRAM for config information. If that is off we will get timeouts. 2) Always try to sync with the firmware, if there is no firmware running do not treat it as an error and instead just report it the first time we notice this condition. 3) If there is no valid SRAM signature, assume the device is onboard by setting TG3_FLAG_EEPROM_WRITE_PROT. Update driver version and release date. With help from Michael Chan and Fabio Massimo Di Nitto. Signed-off-by: David S. Miller commit 5224e6cc3ab5ae03895bbb67f4a26ce72e62ce58 tree a2e2ba48895d6f5dc36c9fa7317042c31b5b15e0 parent 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 author David S. Miller Tue, 06 Jun 2006 17:37:41 -0700 committer David S. Miller Fri, 09 Jun 2006 12:03:49 -0700 [SPARC64]: Dump local cpu registers in sun4v_log_error() This makes the debugging information more usable. Signed-off-by: David S. Miller commit 133dda1e4f757e036fa838cba6804d0344931c4a tree 1ca77025cb56fcacaee6f50501642784b568430e parent 33b7497794424181dca87f18e43ecbc07f86bba5 author Arnd Bergmann Wed, 07 Jun 2006 12:04:18 +1000 committer Paul Mackerras Fri, 09 Jun 2006 13:06:00 +1000 [PATCH] powerpc: Fix cell blade detection The IBM Cell blade firmware might confuse the kernel to think it's a pSeries machine. This fixes it for now. With a bit of luck, the firmware will be updated to avoid that in the future but currently that patch is needed. Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Paul Mackerras commit 33b7497794424181dca87f18e43ecbc07f86bba5 tree bfcd314e42da1ef4098d272a7ab3f2f49da429a9 parent 7c85d1f9d358b24c5b05c3a2783a78423775a080 author Benjamin Herrenschmidt Wed, 07 Jun 2006 12:01:32 +1000 committer Paul Mackerras Fri, 09 Jun 2006 13:05:51 +1000 [PATCH] powerpc: Fix call to ibm,client-architecture-support The code in prom_init.c calling the firmware ibm,client-architecture-support method on pSeries has a bug where it fails to properly pass the instance handle of the firmware object when trying to call a method. Result ranges from the call doing nothing to the firmware crashing. (Found by Segher, thanks !) Signed-off-by: Benjamin Herrenschmidt Signed-off-by: Segher Boessenkool Signed-off-by: Paul Mackerras commit 7c85d1f9d358b24c5b05c3a2783a78423775a080 tree 71f92966cba279120cb81965cb3a5294295413ba parent 1def630a6a49dda5bc89dfbd86656293640456f0 author Paul Mackerras Fri, 09 Jun 2006 13:02:59 +1000 committer Paul Mackerras Fri, 09 Jun 2006 13:02:59 +1000 powerpc: Fix machine check problem on 32-bit kernels This fixes a bug found by Dave Jones that means that it is possible for userspace to provoke a machine check on 32-bit kernels. This also fixes a couple of other places where I found similar problems by inspection. Signed-off-by: Paul Mackerras commit 128e6ced247cda88f96fa9f2e4ba8b2c4a681560 tree 431e59010f5b22cf26eb5db29136dfeaba2fe0fa parent bafe00cc9297ca77b66e5c83e5e65e17c0c997c8 parent cb15f81beb1e2ad015d6e7aea2f9b49fdbda9d1a author Linus Torvalds Thu, 08 Jun 2006 15:16:35 -0700 committer Linus Torvalds Thu, 08 Jun 2006 15:16:35 -0700 Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 * 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: e1000: remove risky prefetch on next_skb->data e1000: fix ethtool test irq alloc as "probe" [PATCH] bcm43xx: add DMA rx poll workaround to DMA4 commit bafe00cc9297ca77b66e5c83e5e65e17c0c997c8 tree c0478b45a084464c515a3201b109d7589773670b parent 71601e2b33dad9acb8d7844f7321f90ed9d1bce8 author Martin Schwidefsky Thu, 08 Jun 2006 01:36:20 -0700 committer Linus Torvalds Thu, 08 Jun 2006 15:15:30 -0700 [PATCH] s390: fix in-user atomic futex operation. From: Martin Schwidefsky __futex_atomic_op needs to do an atomic operation in the user address space, not the kernel address space. Add the missing sacf 256/sacf 0 to switch to the secondary mode before doing the compare-and-swap. In addition add another fixup for catch specification exceptions if the compare-and-swap address is not aligned. Signed-off-by: Martin Schwidefsky Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 71601e2b33dad9acb8d7844f7321f90ed9d1bce8 tree 5057391f7c99e207ca8a18c075bc2333b57d3e7f parent bc1c116974a5c3f498112a6f175d3e4a8cd5bdbc author Jens Axboe Thu, 08 Jun 2006 10:26:39 +0200 committer Linus Torvalds Thu, 08 Jun 2006 15:14:24 -0700 [PATCH] debugfs inode leak Looking at the reiser4 crash, I found a leak in debugfs. In debugfs_mknod(), we create the inode before checking if the dentry already has one attached. We don't free it if that is the case. These bugs happen quite often, I'm starting to think we should disallow such coding in CodingStyle. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit bc1c116974a5c3f498112a6f175d3e4a8cd5bdbc tree 69ea68db91fb871cd24a0a5c5045abbe9c77bd3a parent 26e780e8ef1cc3ef581a07aafe2346bb5a07b4f9 author Jens Axboe Thu, 08 Jun 2006 08:49:06 +0200 committer Linus Torvalds Thu, 08 Jun 2006 15:14:23 -0700 [PATCH] elevator switching race There's a race between shutting down one io scheduler and firing up the next, in which a new io could enter and cause the io scheduler to be invoked with bad or NULL data. To fix this, we need to maintain the queue lock for a bit longer. Unfortunately we cannot do that, since the elevator init requires to be run without the lock held. This isn't easily fixable, without also changing the mempool API. So split the initialization into two parts, and alloc-init operation and an attach operation. Then we can preallocate the io scheduler and related structures, and run the attach inside the lock after we detach the old one. This patch has survived 30 minutes of 1 second io scheduler switching with a very busy io load. Signed-off-by: Jens Axboe Signed-off-by: Linus Torvalds commit 26e780e8ef1cc3ef581a07aafe2346bb5a07b4f9 tree b62f2e5aceddd69e0671971bc84b709a5a9e3c26 parent 45b35a5ced474b9fbbbfcfd5cf346c432d28d9fd author Malcom Parsons Thu, 08 Jun 2006 00:43:42 -0700 committer Linus Torvalds Thu, 08 Jun 2006 15:12:21 -0700 [PATCH] fbcon: fix limited scroll in SCROLL_PAN_REDRAW mode From: Malcom Parsons When scrolling up in SCROLL_PAN_REDRAW mode with a large limited scroll region, the bottom few lines have to be redrawn. Without this patch, the wrong text is drawn into these lines, corrupting the display. Observed in 2.6.14 when running an IRC client in the Nintendo DS linux port. I haven't tested if scrolling down has the same problem. Signed-off-by: Antonino Daplas Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit 45b35a5ced474b9fbbbfcfd5cf346c432d28d9fd tree a6570f00cb40b3e38c3db277e75547ed6f0e34d4 parent fd0a0ac1c5393b226640a30bae753983068136b3 author Ralf Baechle Thu, 08 Jun 2006 00:43:41 -0700 committer Linus Torvalds Thu, 08 Jun 2006 15:12:21 -0700 [PATCH] Fix mempolicy.h build error From: Ralf Baechle uses struct mm_struct and relies on a definition or declaration somehow magically being dragged in which may result in a build: [...] CC mm/mempolicy.o In file included from mm/mempolicy.c:69: include/linux/mempolicy.h:150: warning: ‘struct mm_struct’ declared inside parameter list include/linux/mempolicy.h:150: warning: its scope is only this definition or declaration, which is probably not what you want include/linux/mempolicy.h:175: warning: ‘struct mm_struct’ declared inside parameter list mm/mempolicy.c:622: error: conflicting types for ‘do_migrate_pages’ include/linux/mempolicy.h:175: error: previous declaration of ‘do_migrate_pages’ was here mm/mempolicy.c:1661: error: conflicting types for ‘mpol_rebind_mm’ include/linux/mempolicy.h:150: error: previous declaration of ‘mpol_rebind_mm’ was here make[1]: *** [mm/mempolicy.o] Error 1 make: *** [mm] Error 2 [ralf@denk linux-ip35]$ Including is a step into direction of include hell so fixed by adding a forward declaration of struct mm_struct instead. Signed-off-by: Ralf Baechle Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit fd0a0ac1c5393b226640a30bae753983068136b3 tree 5d44c0bca57ec726be332338dad1935605e27d3c parent a2ef3a50f19f64d350bdc0aa15c31ae4b8973f57 author Lennert Buytenhek Thu, 08 Jun 2006 00:43:40 -0700 committer Linus Torvalds Thu, 08 Jun 2006 15:12:21 -0700 [PATCH] ep93xx build fix From: Lennert Buytenhek The recent renaming of m48t86's ->readb() and ->writeb() platform driver methods (2d7b20c1884777e66009be1a533641c19c4705f6) to ->readbyte() and ->writebyte() to fix the ia64 build broke the build of the cirrus ep93xx ARM platform. This patch fixes it up. Signed-off-by: Lennert Buytenhek Cc: Alessandro Zummo Cc: Russell King Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit a2ef3a50f19f64d350bdc0aa15c31ae4b8973f57 tree a34de089cfe8cf433eca46b0aaf3d81e208aae85 parent d44647b0a6e48d18a1402dfa9052d85c4fe98341 author Andy Currid Thu, 08 Jun 2006 00:43:39 -0700 committer Linus Torvalds Thu, 08 Jun 2006 15:12:21 -0700 [PATCH] Fix HPET operation on 64-bit NVIDIA platforms From: "Andy Currid" This patch fixes a kernel panic during boot that occurs on NVIDIA platforms that have HPET enabled. When HPET is enabled, the standard timer IRQ is routed to IOAPIC pin 2 and is advertised as such in the ACPI APIC table - but an earlier workaround in the kernel was ignoring this override. The fix is to honor timer IRQ overrides from ACPI when HPET is detected on an NVIDIA platform. Signed-off-by: Andy Currid Cc: "Brown, Len" Cc: "Yu, Luming" Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit d44647b0a6e48d18a1402dfa9052d85c4fe98341 tree b71d11af7eac501ba37d7ea45caecf5eb0a3cfe9 parent 1def630a6a49dda5bc89dfbd86656293640456f0 author Andy Currid Thu, 08 Jun 2006 00:43:38 -0700 committer Linus Torvalds Thu, 08 Jun 2006 15:12:21 -0700 [PATCH] Fix HPET operation on 32-bit NVIDIA platforms From: "Andy Currid" This patch fixes a kernel panic during boot that occurs on NVIDIA platforms that have HPET enabled. When HPET is enabled, the standard timer IRQ is routed to IOAPIC pin 2 and is advertised as such in the ACPI APIC table - but an earlier workaround in the kernel was ignoring this override. The fix is to honor timer IRQ overrides from ACPI when HPET is detected on an NVIDIA platform. Signed-off-by: Andy Currid Cc: "Brown, Len" Cc: "Yu, Luming" Cc: Andi Kleen Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds commit cb15f81beb1e2ad015d6e7aea2f9b49fdbda9d1a tree ae1437d26c61392c7829a8b8d5c04a6c0772089f parent 2e84abe742c42f7b063b141db55e5793ce4c502c parent 24f476eeecba66524af3f95e31ac208eea99e617 author Jeff Garzik Thu, 08 Jun 2006 15:49:36 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:49:36 -0400 Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream-fixes commit 2e84abe742c42f7b063b141db55e5793ce4c502c tree 38ce19eb451b969389e456aa4d9bb7321626f481 parent 1def630a6a49dda5bc89dfbd86656293640456f0 parent ea9a7719597e81a119a155178eabfc941eef11cc author Jeff Garzik Thu, 08 Jun 2006 15:46:27 -0400 committer Jeff Garzik Thu, 08 Jun 2006 15:46:27 -0400 Merge branch 'upstream-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6 into upstream-fixes commit 24f476eeecba66524af3f95e31ac208eea99e617 tree bbcd87d78ea4bd38100645ca28797a5c3df9a741 parent b9b6e78b11de295ef073271979355d5fab71b877 author Auke Kok Thu, 08 Jun 2006 09:28:47 -0700 committer Auke Kok Thu, 08 Jun 2006 09:28:47 -0700 e1000: remove risky prefetch on next_skb->data It was brought to our attention that the prefetches break e1000 traffic on xscale/arm architectures. Remove them for now. We'll let them stay in mm for a while, or find a better solution to enable. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit b9b6e78b11de295ef073271979355d5fab71b877 tree 63f35532786844d5a32e391e13e5bafe7bb6ef0f parent e82b0f2cc21be905e504573483fa9542b15df96f author Auke Kok Thu, 08 Jun 2006 09:28:38 -0700 committer Auke Kok Thu, 08 Jun 2006 09:28:38 -0700 e1000: fix ethtool test irq alloc as "probe" New code added in 2.6.17 caused setup_irq to print a warning when running ethtool -t eth0 offline. This test marks the request_irq call made by this test as a "probe" to see if the interrupt is shared or not. Signed-off-by: Jesse Brandeburg Signed-off-by: Auke Kok commit ea9a7719597e81a119a155178eabfc941eef11cc tree f55cdd1138d851544beef3c12f991821aaead2cf parent 672c6108a51bf559d19595d9f8193dfd81f0f752 author Michael Buesch Sun, 04 Jun 2006 02:20:42 +0200 committer John W. Linville Mon, 05 Jun 2006 15:28:56 -0400 [PATCH] bcm43xx: add DMA rx poll workaround to DMA4 Also add the Poll RX DMA Memory workaround to the DMA4 (xmitstatus) path. Signed-off-by: Michael Buesch Signed-off-by: John W. Linville