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