Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: v2.6.33-rc5-gi…

Jan 29, 2010

  1. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/viro/vfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
      Fix failure exit in ipathfs
      fix oops in fs/9p late mount failure
      fix leak in romfs_fill_super()
      get rid of pointless checks after simple_pin_fs()
      Fix failure exits in bfs_fill_super()
      fix affs parse_options()
      Fix remount races with symlink handling in affs
      Fix a leak in affs_fill_super()
    authored January 28, 2010
  2. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jbarnes/pci-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
      x86/PCI: remove IOH range fetching
      PCI: fix nested spinlock hang in aer_inject
    authored January 28, 2010

Jan 28, 2010

  1. Linus Torvalds

    Merge master.kernel.org:/home/rmk/linux-2.6-arm

    * master.kernel.org:/home/rmk/linux-2.6-arm:
      [ARM] Update mach-types
      [ARM] orion5x: D-link DNS-323 rev. B1 power-off
      [ARM] Orion5x: add GPIO LED and buttons for wrt350n v2
      [ARM] pxa: fix irq suspend/resume for pxa25x
      [ARM] pxa: fix the incorrect naming of AC97 reset pin config for pxa26x
      [ARM] pxa/corgi: fix incorrect default GPIO for UDC Vbus
      [ARM] Kirkwood: drive USB VBUS pin on rd88f6192-nas high on boot
      [ARM] Orion: fix PCIe inbound window programming when RAM size is not a power of two
    authored January 28, 2010
  2. [ARM] Update mach-types

    Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
    authored January 28, 2010
  3. Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/y…

    …cmiao/pxa-linux-2.6
    authored January 28, 2010
  4. Linus Torvalds

    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: PowerTV: Fix support for timer interrupts with > 64 external IRQs
      MIPS: PowerTV: Streamline access to platform device registers
      MIPS: Fix vmlinuz build for 32bit-only math shells
      MIPS: Add support of LZO-compressed kernels
    authored January 28, 2010
  5. Linus Torvalds

    Merge branch 'for-linus' of git://git.infradead.org/ubi-2.6

    * 'for-linus' of git://git.infradead.org/ubi-2.6:
      UBI: fix volume creation input checking
    authored January 28, 2010
  6. Linus Torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/ieee1394/linux1394-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
      firewire: ohci: fix crashes with TSB43AB23 on 64bit systems
      firewire: core: fix use-after-free regression in FCP handler
      firewire: cdev: add_descriptor documentation fix
      firewire: core: add_descriptor size check
    authored January 28, 2010
  7. Jeff Garrett

    x86/PCI: remove IOH range fetching

    Turned out to cause trouble on single IOH machines, and is superceded by
    _CRS on multi-IOH machines with production BIOSes.
    
    Signed-off-by: Jeff Garrett <jeff@jgarrett.org>
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    authored January 27, 2010 Jesse Barnes committed January 28, 2010

Jan 27, 2010

  1. MIPS: PowerTV: Fix support for timer interrupts with > 64 external IRQs

    The MIPS processor is limited to 64 external interrupt sources. Using a
    greater number without IRQ sharing requires reading platform-specific
    registers. On such platforms, reading the IntCtl register to determine
    which interrupt corresponds to a timer interrupt will not work.
    
    On MIPSR2 systems there is a solution - the TI bit in the Cause register,
    specifically indicates that a timer interrupt has occured. This patch uses
    that bit to detect interrupts for MIPSR2 processors, which may be expected
    to work regardless of how the timer interrupt may be routed in the hardware.
    
    Signed-off-by: David VomLehn (dvomlehn@cisco.com)
    To: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/804/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    authored December 21, 2009 Ralf Baechle committed January 28, 2010
  2. MIPS: PowerTV: Streamline access to platform device registers

    Pre-compute addresses for the basic ASIC registers. This speeds up access
    and allows memory for unused configurations to be freed. In addition,
    uninitialized register addresses will be returned as NULL to catch bad
    usage quickly.
    
    Signed-off-by: David VomLehn <dvomlehn@cisco.com>
    To: linux-mips@linux-mips.org
    Patchwork: http://patchwork.linux-mips.org/patch/806/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    authored December 23, 2009 Ralf Baechle committed January 28, 2010
  3. MIPS: Fix vmlinuz build for 32bit-only math shells

    POSIX requires $((<expression>)) arithmetic in sh only to have long
    arithmetic so on 32-bit sh binaries might do only 32-bit arithmetic but
    the arithmetic done in arch/mips/boot/compressed/Makefile needs 64-bit.
    
    I play with the AR7 platform, so VMLINUX_LOAD_ADDRESS is
    0xffffffff94100000, and for an example 4MiB kernel
    VMLINUZ_LOAD_ADDRESS is made out to be:
    ----
    alex@berk:~$ bash -c 'printf "%x\n" $((0xffffffff94100000 + 0x400000))'
    ffffffff94500000
    alex@berk:~$ dash -c 'printf "%x\n" $((0xffffffff94100000 + 0x400000))'
    80000000003fffff
    ----
    
    The former is obviously correct whilst the later breaks things royally.
    
    Fortunately working with only the lower 32bit's works for both bash and
    dash:
    ----
    $ bash -c 'printf "%x\n" $((0x94100000 + 0x400000))'
    94500000
    $ dash -c 'printf "%x\n" $((0x94100000 + 0x400000))'
    94500000
    ----
    
    So, we can split the original 64bit string to two parts, and only
    calculate the low 32bit part, which is big enough (1GiB kernel sizes
    anyone?) for a normal Linux kernel image file, now, we calculate the
    VMLINUZ_LOAD_ADDRESS like this:
    
    1. if present, append top 32bit of VMLINUX_LOAD_ADDRESS" as a prefix
    2. get the sum of the low 32bit of VMLINUX_LOAD_ADDRESS + VMLINUX_SIZE
    
    This patch fixes vmlinuz kernel builds on systems where only a
    32bit-only math shell is available.
    
    Patch Changelog:
      Version 2
        - simplified method by using 'expr' for 'substr' and making it work
    	with dash once again
      Version 1
        - Revert the removals of '-n "$(VMLINUX_SIZE)"' to avoid the error
            of "make clean"
        - Consider more cases of the VMLINUX_LOAD_ADDRESS
      Version 0
        - initial release
    
    Signed-off-by: Alexander Clouter <alex@digriz.org.uk>
    Acked-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Patchwork: http://patchwork.linux-mips.org/patch/861/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    authored January 20, 2010 Ralf Baechle committed January 28, 2010
  4. lzufalcon

    MIPS: Add support of LZO-compressed kernels

    The necessary changes to the x86 Kconfig and boot/compressed to allow the
    use of this new compression method.
    
    Signed-off-by: Wu Zhangjin <wuzhangjin@gmail.com>
    Cc: linux-mips@linux-mips.org
    Cc: Sergei Shtylyov <sshtylyov@ru.mvista.com>
    Patchwork: http://patchwork.linux-mips.org/patch/857/
    Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
    authored January 15, 2010 Ralf Baechle committed January 28, 2010
  5. Merge branch 'for-rmk' of git://git.marvell.com/orion

    authored January 27, 2010
  6. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixe…

    …s-2.6
    
    * git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-rc-fixes-2.6:
      [SCSI] aic79xx: check for non-NULL scb in ahd_handle_nonpkt_busfree
      [SCSI] zfcp: Set hardware timeout as requested by BSG request.
      [SCSI] zfcp: Introduce bsg_timeout callback.
      [SCSI] scsi_transport_fc: Allow LLD to reset FC BSG timeout
      [SCSI] zfcp: add missing compat ptr conversion
      [SCSI] zfcp: Fix linebreak in hba trace
      [SCSI] zfcp: Issue zfcp_fc_wka_port_put after FC CT BSG request
      [SCSI] qla2xxx: Update version number to 8.03.01-k10.
      [SCSI] fc-transport: Use packed modifier for fc_bsg_request structure.
      [SCSI] qla2xxx: Perform fast mailbox read of flash regardless of size nor address alignment.
      [SCSI] qla2xxx: Correct FCP2 recovery handling.
      [SCSI] scsi_lib: Fix bug in completion of bidi commands
      [SCSI] mptsas: Fix issue with chain pools allocation on katmai
      [SCSI] aacraid: fix File System going into read-only mode
      [SCSI] lpfc: fix file permissions
    authored January 27, 2010
  7. Linus Torvalds

    Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6

    * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
      [S390] fix single stepped svcs with TRACE_IRQFLAGS=y
      [S390] zcrypt: Do not remove coprocessor for error 8/72
      [S390] sclp_vt220: set initial terminal window size
      [S390] use set_current_state in sigsuspend
      [S390] irqflags: add missing types.h include
      [S390] dasd: fix possible NULL pointer errors
    authored January 27, 2010
  8. ickle

    drm/i915: Selectively enable self-reclaim

    Having missed the ENOMEM return via i915_gem_fault(), there are probably
    other paths that I also missed. By not enabling NORETRY by default these
    paths can run the shrinker and take memory from the system (but not from
    our own inactive lists because our shrinker can not run whilst we hold
    the struct mutex) and this may allow the system to survive a little longer
    whilst our drivers consume all available memory.
    
    References:
      OOM killer unexpectedly called with kernel 2.6.32
      http://bugzilla.kernel.org/show_bug.cgi?id=14933
    
    v2: Pass gfp into page mapping.
    v3: Use new read_cache_page_gfp() instead of open-coding.
    
    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
    Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
    Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
    Cc: Eric Anholt <eric@anholt.net>
    Cc: stable@kernel.org
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    authored January 27, 2010 torvalds committed January 27, 2010
  9. firewire: ohci: fix crashes with TSB43AB23 on 64bit systems

    Unsurprisingly, Texas Instruments TSB43AB23 exhibits the same behaviour
    as TSB43AB22/A in dual buffer IR DMA mode:  If descriptors are located
    at physical addresses above the 31 bit address range (2 GB), the
    controller will overwrite random memory.  With luck, this merely
    prevents video reception.  With only a little less luck, the machine
    crashes.
    
    We use the same workaround here as with TSB43AB22/A:  Switch off the
    dual buffer capability flag and use packet-per-buffer IR DMA instead.
    Another possible workaround would be to limit the coherent DMA mask to
    31 bits.
    
    In Linux 2.6.33, this change serves effectively only as documentation
    since dual buffer mode is not used for any controller anymore.  But
    somebody might want to re-enable it in the future to make use of
    features of dual buffer DMA that are not available in packet-per-buffer
    mode.
    
    In Linux 2.6.32 and older, this update is vital for anyone with this
    controller, more than 2 GB RAM, a 64 bit kernel, and FireWire video or
    audio applications.
    
    We have at least four reports:
    http://bugzilla.kernel.org/show_bug.cgi?id=13808
    http://marc.info/?l=linux1394-user&m=126154279004083
    https://bugzilla.redhat.com/show_bug.cgi?id=552142
    http://marc.info/?l=linux1394-user&m=126432246128386
    
    Reported-by: Paul Johnson
    Reported-by: Ronneil Camara
    Reported-by: G Zornetzer
    Reported-by: Mark Thompson
    Cc: stable@kernel.org
    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    authored January 26, 2010
  10. Linus Torvalds

    mm: add new 'read_cache_page_gfp()' helper function

    It's a simplified 'read_cache_page()' which takes a page allocation
    flag, so that different paths can control how aggressive the memory
    allocations are that populate a address space.
    
    In particular, the intel GPU object mapping code wants to be able to do
    a certain amount of own internal memory management by automatically
    shrinking the address space when memory starts getting tight.  This
    allows it to dynamically use different memory allocation policies on a
    per-allocation basis, rather than depend on the (static) address space
    gfp policy.
    
    The actual new function is a one-liner, but re-organizing the helper
    functions to the point where you can do this with a single line of code
    is what most of the patch is all about.
    
    Tested-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    authored January 27, 2010
  11. Linus Torvalds

    Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/li…

    …nux/kernel/git/tip/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      x86, msr/cpuid: Pass the number of minors when unregistering MSR and CPUID drivers.
      x86: Remove "x86 CPU features in debugfs" (CONFIG_X86_CPU_DEBUG)
      Revert "x86: ucode-amd: Load ucode-patches once ..."
      x86: Disable HPET MSI on ATI SB700/SB800
      x86: Set hotpluggable nodes in nodes_possible_map
    authored January 27, 2010
  12. Linus Torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
      sparc64: Fix UP build.
    authored January 27, 2010
  13. UBI: fix volume creation input checking

    Do not use an unchecked variable UBI_IOCMKVOL ioctl.
    
    Signed-off-by: Mika Westerberg <ext-mika.1.westerberg@nokia.com>
    Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
    Cc: stable@vger.kernel.org
    authored January 26, 2010 Artem Bityutskiy committed January 27, 2010
  14. [S390] fix single stepped svcs with TRACE_IRQFLAGS=y

    If irq flags tracing is enabled the TRACE_IRQS_ON macros expands to
    a function call which clobbers registers %r0-%r5. The macro is used
    in the code path for single stepped system calls. The argument
    registers %r2-%r6 need to be restored from the stack before the system
    call function is called.
    
    Cc: stable@kernel.org
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    authored January 27, 2010 Martin Schwidefsky committed January 27, 2010
  15. [S390] zcrypt: Do not remove coprocessor for error 8/72

    In a case where the number of the input data is bigger than the
    modulus of the key, the coprocessor adapters will report an 8/72
    error. This case is not caught yet, thus the adapter will be taken
    offline. To prevent this, we return an -EINVAL instead.
    
    Signed-off-by: Felix Beck <felix.beck@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    authored January 27, 2010 Martin Schwidefsky committed January 27, 2010
  16. [S390] sclp_vt220: set initial terminal window size

    When opening a SCLP VT220 terminal, the terminal window size is not
    initialized (defaults to zero).
    Since the SCLP VT220 terminal supports only 80x24, explicitly set
    the window size to prevent (n)curses applications from guessing
    the default setting.
    
    Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    authored January 27, 2010 Martin Schwidefsky committed January 27, 2010
  17. [S390] use set_current_state in sigsuspend

    Use set_current_state instead of a direct assignment to set the
    task state of the current process.
    
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    authored January 27, 2010 Martin Schwidefsky committed January 27, 2010
  18. [S390] irqflags: add missing types.h include

    Add missing types.h include. Otherwise would cause build breakages on
    hw breakpoint support, because of undefined BITS_PER_LONG.
    Also fix up the copyright line and remove the superfluous __KERNEL__
    ifdef.
    
    Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    authored January 27, 2010 Martin Schwidefsky committed January 27, 2010
  19. [S390] dasd: fix possible NULL pointer errors

    Fix possible NULL pointer in DASD messages and correct discipline
    checking.
    
    Signed-off-by: Stefan Haberland <stefan.haberland@de.ibm.com>
    Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
    authored January 27, 2010 Martin Schwidefsky committed January 27, 2010
  20. x86, msr/cpuid: Pass the number of minors when unregistering MSR and …

    …CPUID drivers.
    
    Pass the number of minors when unregistering MSR and CPUID drivers.
    
    Reported-by: Dean Nelson <dnelson@redhat.com>
    Signed-off-by: Dean Nelson <dnelson@redhat.com>
    LKML-Reference: <20100127023722.GA22305@sgi.com>
    Signed-off-by: Russ Anderson <rja@sgi.com>
    Signed-off-by: H. Peter Anvin <hpa@zytor.com>
    authored January 26, 2010 H. Peter Anvin committed January 26, 2010
  21. Fix failure exit in ipathfs

    deactivate_locked_super() will be done by caller of fill_super, doing
    it there as well is b0rken.
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    authored January 25, 2010
  22. fix oops in fs/9p late mount failure

    if 9P ->get_sb() fails late (at root inode or root dentry
    allocation), we'll hit its ->kill_sb() with NULL ->s_root
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    authored January 25, 2010
  23. fix leak in romfs_fill_super()

    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    authored January 25, 2010
  24. get rid of pointless checks after simple_pin_fs()

    if we'd just got success from it, vfsmount won't be NULL
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    authored January 25, 2010
  25. Fix failure exits in bfs_fill_super()

    double iput(), leaks...
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    authored January 24, 2010
  26. fix affs parse_options()

    Error handling in that sucker got broken back in 2003.  If function
    returns 0 on failure, it's not nice to add return -EINVAL into it.
    Adding return 1 on other failure exits is also not a good thing (and
    yes, original success exits with 1 and some of failure exits with 0
    are still there; so's the original logics in callers).
    
    Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
    authored January 24, 2010
Something went wrong with that request. Please try again.