1. 09 Jun, 2006 30 commits
  2. 08 Jun, 2006 10 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 · 128e6ced
      Linus Torvalds authored
      * '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
      128e6ced
    • Martin Schwidefsky's avatar
      [PATCH] s390: fix in-user atomic futex operation. · bafe00cc
      Martin Schwidefsky authored
      From: Martin Schwidefsky <schwidefsky@de.ibm.com>
      
      __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: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      bafe00cc
    • Jens Axboe's avatar
      [PATCH] debugfs inode leak · 71601e2b
      Jens Axboe authored
      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: default avatarJens Axboe <axboe@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      71601e2b
    • Jens Axboe's avatar
      [PATCH] elevator switching race · bc1c1169
      Jens Axboe authored
      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: default avatarJens Axboe <axboe@suse.de>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      bc1c1169
    • Malcom Parsons's avatar
      [PATCH] fbcon: fix limited scroll in SCROLL_PAN_REDRAW mode · 26e780e8
      Malcom Parsons authored
      From: Malcom Parsons <malcolm.parsons@gmail.com>
      
      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: default avatarAntonino Daplas <adaplas@pol.net>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      26e780e8
    • Ralf Baechle's avatar
      [PATCH] Fix mempolicy.h build error · 45b35a5c
      Ralf Baechle authored
      From: Ralf Baechle <ralf@linux-mips.org>
      
      <linux/mempolicy.h> 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 <linux/sched.h> is a step into direction of include hell so
      fixed by adding a forward declaration of struct mm_struct instead.
      Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      45b35a5c
    • Lennert Buytenhek's avatar
      [PATCH] ep93xx build fix · fd0a0ac1
      Lennert Buytenhek authored
      From: Lennert Buytenhek <buytenh@wantstofly.org>
      
      The recent renaming of m48t86's ->readb() and ->writeb() platform driver
      methods (2d7b20c1) 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: default avatarLennert Buytenhek <buytenh@wantstofly.org>
      Cc: Alessandro Zummo <a.zummo@towertech.it>
      Cc: Russell King <rmk@arm.linux.org.uk>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      fd0a0ac1
    • Andy Currid's avatar
      [PATCH] Fix HPET operation on 64-bit NVIDIA platforms · a2ef3a50
      Andy Currid authored
      From: "Andy Currid" <ACurrid@nvidia.com>
      
      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: default avatarAndy Currid <acurrid@nvidia.com>
      Cc: "Brown, Len" <len.brown@intel.com>
      Cc: "Yu, Luming" <luming.yu@intel.com>
      Cc: Andi Kleen <ak@muc.de>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      a2ef3a50
    • Andy Currid's avatar
      [PATCH] Fix HPET operation on 32-bit NVIDIA platforms · d44647b0
      Andy Currid authored
      From: "Andy Currid" <ACurrid@nvidia.com>
      
      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: default avatarAndy Currid <acurrid@nvidia.com>
      Cc: "Brown, Len" <len.brown@intel.com>
      Cc: "Yu, Luming" <luming.yu@intel.com>
      Cc: Andi Kleen <ak@muc.de>
      Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
      d44647b0
    • Jeff Garzik's avatar
      Merge branch 'upstream-fixes' of... · cb15f81b
      Jeff Garzik authored
      Merge branch 'upstream-fixes' of git://lost.foo-projects.org/~ahkok/git/netdev-2.6 into upstream-fixes
      cb15f81b