Permalink
Commits on Apr 20, 2010
  1. Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/jack/linux-fs-2.6
    
    * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs-2.6:
      quota: Convert __DQUOT_PARANOIA symbol to standard config option
    torvalds committed Apr 20, 2010
  2. quota: Convert __DQUOT_PARANOIA symbol to standard config option

    Make __DQUOT_PARANOIA define from the old days a standard config option
    and turn it off by default.
    
    This gets rid of a quota warning about writes before quota is turned on
    for systems with ext4 root filesystem. Currently there's no way to legally
    solve this because /etc/mtab has to be written before quota is turned on
    on most systems.
    
    Signed-off-by: Jan Kara <jack@suse.cz>
    jankara committed Apr 19, 2010
  3. Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    …t/brodo/pcmcia-2.6
    
    * 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
      pcmcia: fix error handling in cm4000_cs.c
      drivers/pcmcia: Add missing local_irq_restore
      serial_cs: MD55x support (PCMCIA GPRS/EDGE modem) (kernel 2.6.33)
      pcmcia: avoid late calls to pccard_validate_cis
      pcmcia: fix ioport size calculation in rsrc_nonstatic
      pcmcia: re-start on MFC override
      pcmcia: fix io_probe due to parent (PCI) resources
      pcmcia: use previously assigned IRQ for all card functions
    torvalds committed Apr 20, 2010
  4. 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 hardirq tracing in trap return path.
      sparc64: Use correct pt_regs in decode_access_size() error paths.
      sparc64: Fix PREEMPT_ACTIVE value.
      sparc64: Run NMIs on the hardirq stack.
      sparc64: Allocate sufficient stack space in ftrace stubs.
      sparc: Fix forgotten kmemleak headers inclusion
    torvalds committed Apr 20, 2010
  5. Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      perf: Fix unsafe frame rewinding with hot regs fetching
    torvalds committed Apr 20, 2010
  6. 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: delay vblank cleanup until after driver unload
    torvalds committed Apr 20, 2010
  7. x86: correctly wire up the newuname system call

    Before commit e28cbf2 ("improve
    sys_newuname() for compat architectures") 64-bit x86 had a private
    implementation of sys_uname which was just called sys_uname, which other
    architectures used for the old uname.
    
    Due to some merge issues with the uname refactoring patches we ended up
    calling the old uname version for both the old and new system call
    slots, which lead to the domainname filed never be set which caused
    failures with libnss_nis.
    
    Reported-and-tested-by: Andy Isaacson <adi@hexapodia.org>
    Signed-off-by: Christoph Hellwig <hch@lst.de>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    Christoph Hellwig committed with torvalds Apr 20, 2010
  8. sparc64: Fix hardirq tracing in trap return path.

    We can overflow the hardirq stack if we set the %pil here
    so early, just let the normal control flow do it.
    
    This is fine as we are allowed to do the actual IRQ enable
    at any point after we call trace_hardirqs_on.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Apr 20, 2010
  9. drm: delay vblank cleanup until after driver unload

    Drivers may use vblank calls now (e.g. drm_vblank_off) in their unload
    paths, so don't clean up the vblank related structures until after
    driver unload.
    
    Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
    Reviewed-by: Kristian Høgsberg <krh@bitplanet.net>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    jbarnes993 committed with Dave Airlie Mar 26, 2010
Commits on Apr 19, 2010
  1. Linux 2.6.34-rc5

    torvalds committed Apr 19, 2010
  2. rmap: add exclusively owned pages to the newest anon_vma

    The recent anon_vma fixes cause many anonymous pages to end up
    in the parent process anon_vma, even when the page is exclusively
    owned by the current process.
    
    Adding exclusively owned anonymous pages to the top anon_vma
    reduces rmap scanning overhead, especially in workloads with
    forking servers.
    
    This patch adds a parameter to __page_set_anon_rmap that can
    be used to indicate whether or not the added page is exclusively
    owned by the current process.
    
    Pages added through page_add_new_anon_rmap are exclusively
    owned by the current process, and can be added to the top
    anon_vma.
    
    Pages added through page_add_anon_rmap can be either shared
    or exclusively owned, so we do the conservative thing and
    add it to the oldest anon_vma.
    
    A next step would be to add the exclusive parameter to
    page_add_anon_rmap, to be used from functions where we do
    know for sure whether a page is exclusively owned.
    
    Signed-off-by: Rik van Riel <riel@redhat.com>
    Reviewed-by: Johannes Weiner <hannes@cmpxchg.org>
    Lightly-tested-by: Borislav Petkov <bp@alien8.de>
    Reviewed-by: Minchan Kim <minchan.kim@gmail.com>
    [ Edited to look nicer  - Linus ]
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    rikvanriel committed with torvalds Apr 14, 2010
  3. Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    …/git/ecryptfs/ecryptfs-2.6
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
      eCryptfs: Turn lower lookup error messages into debug messages
      eCryptfs: Copy lower directory inode times and size on link
      ecryptfs: fix use with tmpfs by removing d_drop from ecryptfs_destroy_inode
      ecryptfs: fix error code for missing xattrs in lower fs
      eCryptfs: Decrypt symlink target for stat size
      eCryptfs: Strip metadata in xattr flag in encrypted view
      eCryptfs: Clear buffer before reading in metadata xattr
      eCryptfs: Rename ecryptfs_crypt_stat.num_header_bytes_at_front
      eCryptfs: Fix metadata in xattr feature regression
    torvalds committed Apr 19, 2010
  4. sparc64: Use correct pt_regs in decode_access_size() error paths.

    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Apr 19, 2010
  5. eCryptfs: Turn lower lookup error messages into debug messages

    Vaugue warnings about ENAMETOOLONG errors when looking up an encrypted
    file name have caused many users to become concerned about their data.
    Since this is a rather harmless condition, I'm moving this warning to
    only be printed when the ecryptfs_verbosity module param is 1.
    
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
    Tyler Hicks committed Mar 25, 2010
  6. eCryptfs: Copy lower directory inode times and size on link

    The timestamps and size of a lower inode involved in a link() call was
    being copied to the upper parent inode.  Instead, we should be
    copying lower parent inode's timestamps and size to the upper parent
    inode.  I discovered this bug using the POSIX test suite at Tuxera.
    
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
    Tyler Hicks committed Mar 23, 2010
  7. ecryptfs: fix use with tmpfs by removing d_drop from ecryptfs_destroy…

    …_inode
    
    Since tmpfs has no persistent storage, it pins all its dentries in memory
    so they have d_count=1 when other file systems would have d_count=0.
    ->lookup is only used to create new dentries. If the caller doesn't
    instantiate it, it's freed immediately at dput(). ->readdir reads
    directly from the dcache and depends on the dentries being hashed.
    
    When an ecryptfs mount is mounted, it associates the lower file and dentry
    with the ecryptfs files as they're accessed. When it's umounted and
    destroys all the in-memory ecryptfs inodes, it fput's the lower_files and
    d_drop's the lower_dentries. Commit 4981e08 added this and a d_delete in
    2008 and several months later commit caeeeec removed the d_delete. I
    believe the d_drop() needs to be removed as well.
    
    The d_drop effectively hides any file that has been accessed via ecryptfs
    from the underlying tmpfs since it depends on it being hashed for it to
    be accessible. I've removed the d_drop on my development node and see no
    ill effects with basic testing on both tmpfs and persistent storage.
    
    As a side effect, after ecryptfs d_drops the dentries on tmpfs, tmpfs
    BUGs on umount. This is due to the dentries being unhashed.
    tmpfs->kill_sb is kill_litter_super which calls d_genocide to drop
    the reference pinning the dentry. It skips unhashed and negative dentries,
    but shrink_dcache_for_umount_subtree doesn't. Since those dentries
    still have an elevated d_count, we get a BUG().
    
    This patch removes the d_drop call and fixes both issues.
    
    This issue was reported at:
    https://bugzilla.novell.com/show_bug.cgi?id=567887
    
    Reported-by:  Árpád Bíró <biroa@demasz.hu>
    Signed-off-by: Jeff Mahoney <jeffm@suse.com>
    Cc: Dustin Kirkland <kirkland@canonical.com>
    Cc: stable@kernel.org
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
    jeffmahoney committed with Tyler Hicks Mar 19, 2010
  8. ecryptfs: fix error code for missing xattrs in lower fs

    If the lower file system driver has extended attributes disabled,
    ecryptfs' own access functions return -ENOSYS instead of -EOPNOTSUPP.
    This breaks execution of programs in the ecryptfs mount, since the
    kernel expects the latter error when checking for security
    capabilities in xattrs.
    
    Signed-off-by: Christian Pulvermacher <pulvermacher@gmx.de>
    Cc: stable@kernel.org
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
    cpulvermacher committed with Tyler Hicks Mar 23, 2010
  9. eCryptfs: Decrypt symlink target for stat size

    Create a getattr handler for eCryptfs symlinks that is capable of
    reading the lower target and decrypting its path.  Prior to this patch,
    a stat's st_size field would represent the strlen of the encrypted path,
    while readlink() would return the strlen of the decrypted path.  This
    could lead to confusion in some userspace applications, since the two
    values should be equal.
    
    https://bugs.launchpad.net/bugs/524919
    
    Reported-by: Loïc Minier <loic.minier@canonical.com>
    Cc: stable@kernel.org
    Signed-off-by: Tyler Hicks <tyhicks@linux.vnet.ibm.com>
    Tyler Hicks committed Mar 22, 2010
  10. Fix ISDN/Gigaset build failure

    Commit b91ecb0 ("gigaset: include cleanup cleanup") removed an implicit
    sched.h inclusion that came in via slab.h, and caused various compile
    problems as a result.
    
    This should fix it.
    
    Reported-by: Ingo Molnar <mingo@elte.hu>
    Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
    torvalds committed Apr 19, 2010
  11. Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/l…

    …inux/kernel/git/tip/linux-2.6-tip
    
    * 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
      rcu: Make RCU lockdep check the lockdep_recursion variable
      rcu: Update docs for rcu_access_pointer and rcu_dereference_protected
      rcu: Better explain the condition parameter of rcu_dereference_check()
      rcu: Add rcu_access_pointer and rcu_dereference_protected
    torvalds committed Apr 19, 2010
  12. Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

    * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
      gigaset: include cleanup cleanup
      packet : remove init_net restriction
      WAN: flush tx_queue in hdlc_ppp to prevent panic on rmmod hw_driver.
      ip: Fix ip_dev_loopback_xmit()
      net: dev_pick_tx() fix
      fib: suppress lockdep-RCU false positive in FIB trie.
      tun: orphan an skb on tx
      forcedeth: fix tx limit2 flag check
      iwlwifi: work around bogus active chains detection
    torvalds committed Apr 19, 2010
  13. 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: add FireMV 2400 PCI ID.
      drm/radeon/kms: allow R500 regs VAP_ALT_NUM_VERTICES and VAP_INDEX_OFFSET
      drivers/gpu/radeon: Add MSPOS regs to safe list.
      drm/radeon/kms: disable the tv encoder when tv/cv is not in use
      drm/radeon/kms: adjust pll settings for tv
      drm/radeon/kms: fix tv dac conflict resolver
      drm/radeon/kms/evergreen: don't enable hdmi audio stuff
      drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0
      drm/radeon/kms: fix rs600 tlb flush
      drm/radeon/kms: print GPU family and device id when loading
      drm/radeon/kms: fix calculation of mipmapped 3D texture sizes
      drm/radeon/kms: only change mode when coherent value changes.
      drm/radeon/kms: more atom parser fixes (v2)
    torvalds committed Apr 19, 2010
  14. Merge master.kernel.org:/home/rmk/linux-2.6-arm

    * master.kernel.org:/home/rmk/linux-2.6-arm:
      ARM: 5974/1: arm/mach-at91 Makefile: remove two blanks.
      ARM: 6052/1: kdump: make kexec work in interrupt context
      ARM: 6051/1: VFP: preserve the HW context when calling signal handlers
      ARM: 6050/1: VFP: fix the SMP versions of vfp_{sync,flush}_hwstate
      ARM: 6007/1: fix highmem with VIPT cache and DMA
      ARM: 5975/1: AT91 slow-clock suspend: don't wait when turning PLLs off
    torvalds committed Apr 19, 2010
  15. pcmcia: fix error handling in cm4000_cs.c

    In the original code we used -ENODEV as the number of bytes to
    copy_to_user() and we didn't release the locks.
    
    Signed-off-by: Dan Carpenter <error27@gmail.com>
    Acked-by: Harald Welte <laforge@gnumonks.org>
    Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
    error27 committed with Dominik Brodowski Apr 18, 2010
  16. drm/radeon/kms: add FireMV 2400 PCI ID.

    This is an M24/X600 chip.
    
    From RH# 581927
    
    cc: stable@kernel.org
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Dave Airlie committed Apr 19, 2010
  17. sparc64: Fix PREEMPT_ACTIVE value.

    It currently overlaps the NMI bit.
    
    Signed-off-by: David S. Miller <davem@davemloft.net>
    davem330 committed Apr 19, 2010
  18. rcu: Make RCU lockdep check the lockdep_recursion variable

    The lockdep facility temporarily disables lockdep checking by
    incrementing the current->lockdep_recursion variable.  Such
    disabling happens in NMIs and in other situations where lockdep
    might expect to recurse on itself.
    
    This patch therefore checks current->lockdep_recursion, disabling RCU
    lockdep splats when this variable is non-zero.  In addition, this patch
    removes the "likely()", as suggested by Lai Jiangshan.
    
    Reported-by: Frederic Weisbecker <fweisbec@gmail.com>
    Reported-by: David Miller <davem@davemloft.net>
    Tested-by: Frederic Weisbecker <fweisbec@gmail.com>
    Signed-off-by: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
    Cc: laijs@cn.fujitsu.com
    Cc: dipankar@in.ibm.com
    Cc: mathieu.desnoyers@polymtl.ca
    Cc: josh@joshtriplett.org
    Cc: dvhltc@us.ibm.com
    Cc: niv@us.ibm.com
    Cc: peterz@infradead.org
    Cc: rostedt@goodmis.org
    Cc: Valdis.Kletnieks@vt.edu
    Cc: dhowells@redhat.com
    Cc: eric.dumazet@gmail.com
    LKML-Reference: <20100415195039.GA22623@linux.vnet.ibm.com>
    Signed-off-by: Ingo Molnar <mingo@elte.hu>
    paulmck committed with Ingo Molnar Apr 15, 2010
  19. drm/radeon/kms: allow R500 regs VAP_ALT_NUM_VERTICES and VAP_INDEX_OF…

    …FSET
    
    [airlied: fix V_A_N_V to not be safe and fix check to make sure only r500
     - bump userspace version]
    
    Signed-off-by: Marek Olšák <maraeo@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    marekolsak committed with Dave Airlie Feb 21, 2010
  20. drivers/gpu/radeon: Add MSPOS regs to safe list.

    Permits MSAA and D3D-style rasterization.
    
    [airlied: add rs600]
    
    Signed-off-by: Corbin Simpson <MostAwesomeDude@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    MostAwesomeDude committed with Dave Airlie Apr 11, 2010
  21. drm/radeon/kms: disable the tv encoder when tv/cv is not in use

    Switching between TV and VGA caused VGA to break on some systems
    since the TV encoder was left enabled when VGA was used.
    
    fixes fdo bug 25520.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie Apr 13, 2010
  22. drm/radeon/kms: adjust pll settings for tv

    May fix fdo bug 26582.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie Apr 9, 2010
  23. drm/radeon/kms: fix tv dac conflict resolver

    On systems with the tv dac shared between DVI and TV,
    we can only use the dac for one of the connectors.
    However, when using a digital monitor on the DVI port,
    you can use the dac for the TV connector just fine.
    Check the use_digital status when resolving the conflict.
    
    Fixes fdo bug 27649, possibly others.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie Apr 15, 2010
  24. drm/radeon/kms/evergreen: don't enable hdmi audio stuff

    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie Apr 16, 2010
  25. drm/radeon/kms/atom: fix dual-link DVI on DCE3.2/4.0

    Got broken during the evergreen merge.
    Fixes fdo bug 27001.
    
    Signed-off-by: Alex Deucher <alexdeucher@gmail.com>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Alex Deucher committed with Dave Airlie Apr 15, 2010
  26. drm/radeon/kms: fix rs600 tlb flush

    Typo in in flush leaded to no flush of the RS600 tlb which
    ultimately leaded to massive system ram corruption, with
    this patch everythings seems to work properly.
    
    Signed-off-by: Jerome Glisse <jglisse@redhat.com>
    Cc: stable <stable@kernel.org>
    Signed-off-by: Dave Airlie <airlied@redhat.com>
    Jerome Glisse committed with Dave Airlie Apr 16, 2010