Commits on Jan 8, 2010
  1. @torvalds

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

    …/git/roland/infiniband
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
      IB/addr: Correct CONFIG_IPv6 to CONFIG_IPV6
      mlx4_core: Fix cleanup in __mlx4_init_one() error path
      IB/mlx4: Fix queue overflow check in post_recv
      IB/mlx4: Initialize SRQ scatter entries when creating an SRQ
    torvalds committed Jan 8, 2010
  2. @torvalds

    Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jwessel/linux-2.6-kgdb
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/linux-2.6-kgdb:
      kgdb: Fix kernel-doc format error in kgdb.h
      blackfin,kgdb: Do not put PC in gdb_regs into retx.
      blackfin,kgdb,probe_kernel: Cleanup probe_kernel_read/write
      maccess,probe_kernel: Allow arch specific override probe_kernel_(read|write)
    torvalds committed Jan 8, 2010
  3. @torvalds

    Merge branch 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linu…

    …x/kernel/git/frederic/random-tracing
    
    * 'reiserfs/kill-bkl' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing:
      reiserfs: Relax reiserfs_xattr_set_handle() while acquiring xattr locks
      reiserfs: Fix unreachable statement
      reiserfs: Don't call reiserfs_get_acl() with the reiserfs lock
      reiserfs: Relax lock on xattr removing
      reiserfs: Relax the lock before truncating pages
      reiserfs: Fix recursive lock on lchown
      reiserfs: Fix mistake in down_write() conversion
    torvalds committed Jan 8, 2010
  4. @torvalds

    Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

    * 'for-linus' of git://oss.sgi.com/xfs/xfs:
      xfs: kill some warnings on i386 builds
    torvalds committed Jan 8, 2010
  5. @torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] move fnptr definition inside #ifdef __KERNEL__
    torvalds committed Jan 8, 2010
  6. @torvalds

    Merge branch 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux

    * 'for-linus/samsung' of git://git.fluff.org/bjdooks/linux:
      ARM: S3C64XX: Fix possible clock look in EPLL and MPLL clock chains
    torvalds committed Jan 8, 2010
  7. @torvalds

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

    …nux/kernel/git/x86/linux-2.6-tip
    
    * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-tip:
      x86, irq: Check move_in_progress before freeing the vector mapping
      x86: copy_from_user() should not return -EFAULT
      Revert "x86: Side-step lguest problem by only building cmpxchg8b_emu for pre-Pentium"
      x86/pci: Intel ioh bus num reg accessing fix
      x86: Fix size for ex trampoline with 32bit
    torvalds committed Jan 8, 2010
  8. @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:
      PCIe AER: prevent AER injection if hardware masks error reporting
      PCI/PM: Use per-device D3 delays
      PCI: Check the node argument passed to cpumask_of_node
      PCI: AER: fix aer inject result in kernel oops
      PCI: pcie portdrv: style cleanup
    torvalds committed Jan 8, 2010
  9. @torvalds

    Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/n…

    …fs-2.6
    
    * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
      nfs: fix oops in nfs_rename()
      sunrpc: fix build-time warning
      sunrpc: on successful gss error pipe write, don't return error
      SUNRPC: Fix the return value in gss_import_sec_context()
      SUNRPC: Fix up an error return value in gss_import_sec_context_kerberos()
    torvalds committed Jan 8, 2010
  10. @dchinner

    xfs: kill some warnings on i386 builds

    Randy Dunlap Reported printk() format-related warnings reported
    on i386 builds in his environment.  Dave Chinner provided this
    patch to eliminate them.
    
    Signed-off by: Dave Chinner <david@fromorbit.com>
    Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
    
    Signed-off-by: Alex Elder <aelder@sgi.com>
    dchinner committed with Alex Elder Dec 17, 2009
  11. [IA64] move fnptr definition inside #ifdef __KERNEL__

    Linus pointed out that this definition should not be
    exported to user space.
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Tony Luck committed Jan 8, 2010
  12. @torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/lenb/linux-acpi-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
      hp-wmi: remove double free caused by merge conflict
    torvalds committed Jan 8, 2010
  13. @torvalds

    Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/g…

    …it/aegl/linux-2.6
    
    * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
      [IA64] __per_cpu_idtrs[] is a memory hog
      [IA64] sanity in #include files.  Move fnptr to types.h
      [IA64] use helpers for rlimits
      [IA64] cpumask_of_node() should handle -1 as a node
    torvalds committed Jan 8, 2010
  14. [IA64] __per_cpu_idtrs[] is a memory hog

    __per_cpu_idtrs is statically allocated ... on CONFIG_NR_CPUS=4096
    systems it hogs 16MB of memory. This is way too much for a quite
    probably unused facility (only KVM uses dynamic TR registers).
    
    Change to an array of pointers, and allocate entries as needed on
    a per cpu basis.  Change the name too as the __per_cpu_ prefix is
    confusing (this isn't a classic <linux/percpu.h> type object).
    
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Tony Luck committed Jan 7, 2010
Commits on Jan 7, 2010
  1. @jwessel

    kgdb: Fix kernel-doc format error in kgdb.h

    linux-next-20081022//include/linux/kgdb.h:308): duplicate section name 'Description'
    
    and fix typos in that file's kernel-doc comments.
    
    Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
    Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Randy Dunlap committed with jwessel Jan 7, 2010
  2. @jwessel

    blackfin,kgdb: Do not put PC in gdb_regs into retx.

    In blackfin, kgdb is running in delayed exception IRQ5 other than in
    exception IRQ3 directly.  Register reti other than retx in pt_regs is
    the kgdb return address. So, don't put PC in gdb_regs into retx.
    
    CC: Mike Frysinger <vapier@gentoo.org>
    Signed-off-by: Sonic Zhang <sonic.adi@gmail.com>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Sonic Zhang committed with jwessel Jan 7, 2010
  3. @jwessel

    blackfin,kgdb,probe_kernel: Cleanup probe_kernel_read/write

    Blackfin needs it own arch specific probe_kernel_read() and
    probe_kernel_write().
    
    This was moved out of the kgdb code and into the
    arch/blackfin/maccess.c, because it is a generic kernel api.
    
    The arch specific kgdb.c for blackfin was cleaned of all functions
    which exist in the kgdb core that do the same thing after resolving
    the probe_kernel_read() and probe_kernel_write().  This also
    eliminated the need for most of the #include's.
    
    CC: Sonic Zhang <sonic.adi@gmail.com>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    jwessel committed Jan 7, 2010
  4. @jwessel

    maccess,probe_kernel: Allow arch specific override probe_kernel_(read…

    …|write)
    
    Some archs such as blackfin, would like to have an arch specific
    probe_kernel_read() and probe_kernel_write() implementation which can
    fall back to the generic implementation if no special operations are
    needed.
    
    CC: Thomas Gleixner <tglx@linutronix.de>
    CC: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>
    jwessel committed Jan 7, 2010
  5. @fweisbec

    reiserfs: Relax reiserfs_xattr_set_handle() while acquiring xattr locks

    Fix remaining xattr locks acquired in reiserfs_xattr_set_handle()
    while we are holding the reiserfs lock to avoid lock inversions.
    
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Christian Kujau <lists@nerdbynature.de>
    Cc: Alexander Beregalov <a.beregalov@gmail.com>
    Cc: Chris Mason <chris.mason@oracle.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    fweisbec committed Jan 7, 2010
  6. @fweisbec

    reiserfs: Fix unreachable statement

    Stanse found an unreachable statement in reiserfs_ioctl. There is a
    if followed by error assignment and `break' with no braces. Add the
    braces so that we don't break every time, but only in error case,
    so that REISERFS_IOC_SETVERSION actually works when it returns no
    error.
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: Reiserfs <reiserfs-devel@vger.kernel.org>
    Cc: Andrew Morton <akpm@linux-foundation.org>
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Jiri Slaby committed with fweisbec Jan 6, 2010
  7. @fweisbec

    reiserfs: Don't call reiserfs_get_acl() with the reiserfs lock

    reiserfs_get_acl is usually not called under the reiserfs lock,
    as it doesn't need it. But it happens when it is called by
    reiserfs_acl_chmod(), which creates a dependency inversion against
    the private xattr inodes mutexes for the given inode.
    
    We need to call it without the reiserfs lock, especially since
    it's unnecessary.
    
    Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
    Cc: Christian Kujau <lists@nerdbynature.de>
    Cc: Alexander Beregalov <a.beregalov@gmail.com>
    Cc: Chris Mason <chris.mason@oracle.com>
    Cc: Ingo Molnar <mingo@elte.hu>
    fweisbec committed Jan 7, 2010
  8. @torvalds

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

    …/git/airlied/drm-2.6
    
    * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
      drm/radeon/kms: rs600: use correct mask for SW interrupt
      gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test
      drm/radeon/radeon_device.c: move a dereference below a NULL test
      drm/radeon/radeon_fence.c: move a dereference below the NULL test
      drm/radeon/radeon_connectors.c: add a NULL test before dereference
      drm/radeon/kms: fix memory leak
      drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
      drm/edid: Fix CVT width/height decode
      drm/edid: Skip empty CVT codepoints
      drm: remove address mask param for drm_pci_alloc()
      drm/radeon/kms: add missing breaks in i2c and ss lookups
      drm/radeon/kms: add primary dac adj values table
      drm/radeon/kms: fallback to default connector table
    torvalds committed Jan 6, 2010
  9. Merge remote branch 'korg/drm-radeon-next' into drm-linus

    * korg/drm-radeon-next:
      drm/radeon/kms: rs600: use correct mask for SW interrupt
      gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test
      drm/radeon/radeon_device.c: move a dereference below a NULL test
      drm/radeon/radeon_fence.c: move a dereference below the NULL test
      drm/radeon/radeon_connectors.c: add a NULL test before dereference
      drm/radeon/kms: fix memory leak
      drm/radeon/kms: add missing breaks in i2c and ss lookups
      drm/radeon/kms: add primary dac adj values table
      drm/radeon/kms: fallback to default connector table
    Dave Airlie committed Jan 7, 2010
  10. @tettamanti

    drm/radeon/kms: rs600: use correct mask for SW interrupt

    The mask happens to be the same, but the IH is reading the status, not the
    not the control register.
    
    Signed-off-by: Luca Tettamanti <kronos.it@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    tettamanti committed with Dave Airlie Dec 28, 2009
  11. gpu/drm/radeon/radeon_irq.c: move a dereference below a NULL test

    If a NULL value is possible, the dereference should only occur after the
    NULL test.
    
    Coverity CID: 13338
    
    Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Darren Jenkins committed with Dave Airlie Dec 30, 2009
  12. drm/radeon/radeon_device.c: move a dereference below a NULL test

    If a NULL value is possible, the dereference should only occur after the
    NULL test.
    
    Coverity CID: 13335
    
    Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Darren Jenkins committed with Dave Airlie Dec 30, 2009
  13. drm/radeon/radeon_fence.c: move a dereference below the NULL test

    If a NULL value is possible, the dereference should only occur after the
    NULL test.
    
    Coverity CID: 13334
    
    Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Darren Jenkins committed with Dave Airlie Dec 30, 2009
  14. drm/radeon/radeon_connectors.c: add a NULL test before dereference

    The encoder variable can be NULL in this function so I believe it should
    be checked before dereference.
    
    Coverity CID: 13253
    
    [airlied: extremely unlikely to happen]
    
    Signed-off-by: Darren Jenkins <darrenrjenkins@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Darren Jenkins committed with Dave Airlie Dec 30, 2009
  15. drm/radeon/kms: fix memory leak

    Stanse found a memory leak in radeon_master_create. master_priv is not
    freed/assigned on all paths. Fix that.
    
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Jiri Slaby committed with Dave Airlie Jan 6, 2010
  16. Merge branch 'drm-core-next' into drm-linus

    * drm-core-next:
      drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command_line()
      drm/edid: Fix CVT width/height decode
      drm/edid: Skip empty CVT codepoints
      drm: remove address mask param for drm_pci_alloc()
    Dave Airlie committed Jan 7, 2010
  17. @RoelKluin

    drm/kms: Fix &&/|| confusion in drm_fb_helper_connector_parse_command…

    …_line()
    
    This always evaluates to true.
    
    Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    RoelKluin committed with Dave Airlie Dec 31, 2009
  18. @nwnk

    drm/edid: Fix CVT width/height decode

    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    nwnk committed with Dave Airlie Jan 4, 2010
  19. @nwnk

    drm/edid: Skip empty CVT codepoints

    Signed-off-by: Adam Jackson <ajax@redhat.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    nwnk committed with Dave Airlie Jan 4, 2010
  20. drm: remove address mask param for drm_pci_alloc()

    drm_pci_alloc() has input of address mask for setting pci dma
    mask on the device, which should be properly setup by drm driver.
    And leave it as a param for drm_pci_alloc() would cause confusion
    or mistake would corrupt the correct dma mask setting, as seen on
    intel hw which set wrong dma mask for hw status page. So remove
    it from drm_pci_alloc() function.
    
    Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Zhenyu Wang committed with Dave Airlie Jan 5, 2010
  21. ARM: S3C64XX: Fix possible clock look in EPLL and MPLL clock chains

    There is a possibility of a loop happening in the PLL output clock
    chain on the S3C64XX series. clk_mpll's parent was set to be
    clk_mout_mpll, but this is fed from clk_fout_epll (which is also
    clk_mpll).
    
    clk_mpll is meant to be the output from the MPLL, and clk_mout_mpll
    is a seperate clock derived from the mux of clk_mpll and clk_fin_mpll
    and thus should be considered a seperate clock.
    
    Anything using clk_mpll directly really should not be relying on this
    being the clock that is eventually routed to a peripheral, so remove the
    loop and ensure that the clocks accurately represent the clock chain
    in the device.
    
    The clk_mpll is not being used outside of the s3c6400-clock.c code, so
    this change should not break anything else.
    
    Do the same for the EPLL.
    
    Signed-off-by: Ben Dooks <ben-linux@fluff.org>
    Ben Dooks committed Jan 7, 2010