1. 26 May, 2011 24 commits
  2. 29 Apr, 2011 12 commits
  3. 28 Apr, 2011 4 commits
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · fafc9929
      Linus Torvalds authored
      * 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6:
        drm/i915: restore only the mode of this driver on lastclose (v2)
        drm/radeon/kms: add info query for tile pipes
        drm/radeon/kms: add missing safe regs for 6xx/7xx
        drm: select FRAMEBUFFER_CONSOLE_PRIMARY if we have FRAMEBUFFER_CONSOLE
      fafc9929
    • Linus Torvalds's avatar
      0dee0e7f
    • Linus Torvalds's avatar
      Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 · 9cab1ba4
      Linus Torvalds authored
      * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
        nfs: don't lose MS_SYNCHRONOUS on remount of noac mount
        NFS: Return meaningful status from decode_secinfo()
        NFSv4: Ensure we request the ordinary fileid when doing readdirplus
        NFSv4: Ensure that clientid and session establishment can time out
        SUNRPC: Allow RPC calls to return ETIMEDOUT instead of EIO
        NFSv4.1: Don't loop forever in nfs4_proc_create_session
        NFSv4: Handle NFS4ERR_WRONGSEC outside of nfs4_handle_exception()
        NFSv4.1: Don't update sequence number if rpc_task is not sent
        NFSv4.1: Ensure state manager thread dies on last umount
        SUNRPC: Fix the SUNRPC Kerberos V RPCSEC_GSS module dependencies
        NFS: Use correct variable for page bounds checking
        NFS: don't negotiate when user specifies sec flavor
        NFS: Attempt mount with default sec flavor first
        NFS: flav_array honors NFS_MAX_SECFLAVORS
        NFS: Fix infinite loop in gss_create_upcall()
        Don't mark_inode_dirty_sync() while holding lock
        NFS: Get rid of pointless test in nfs_commit_done
        NFS: Remove unused argument from nfs_find_best_sec()
        NFS: Eliminate duplicate call to nfs_mark_request_dirty
        NFS: Remove dead code from nfs_fs_mount()
      9cab1ba4
    • Mel Gorman's avatar
      mm: check if PTE is already allocated during page fault · cc03638d
      Mel Gorman authored
      With transparent hugepage support, handle_mm_fault() has to be careful
      that a normal PMD has been established before handling a PTE fault.  To
      achieve this, it used __pte_alloc() directly instead of pte_alloc_map as
      pte_alloc_map is unsafe to run against a huge PMD.  pte_offset_map() is
      called once it is known the PMD is safe.
      
      pte_alloc_map() is smart enough to check if a PTE is already present
      before calling __pte_alloc but this check was lost.  As a consequence,
      PTEs may be allocated unnecessarily and the page table lock taken.  Thi
      useless PTE does get cleaned up but it's a performance hit which is
      visible in page_test from aim9.
      
      This patch simply re-adds the check normally done by pte_alloc_map to
      check if the PTE needs to be allocated before taking the page table lock.
      The effect is noticable in page_test from aim9.
      
        AIM9
                        2.6.38-vanilla 2.6.38-checkptenone
        creat-clo      446.10 ( 0.00%)   424.47 (-5.10%)
        page_test       38.10 ( 0.00%)    42.04 ( 9.37%)
        brk_test        52.45 ( 0.00%)    51.57 (-1.71%)
        exec_test      382.00 ( 0.00%)   456.90 (16.39%)
        fork_test       60.11 ( 0.00%)    67.79 (11.34%)
        MMTests Statistics: duration
        Total Elapsed Time (seconds)                611.90    612.22
      
      (While this affects 2.6.38, it is a performance rather than a functional
      bug and normally outside the rules -stable.  While the big performance
      differences are to a microbench, the difference in fork and exec
      performance may be significant enough that -stable wants to consider the
      patch)
      Reported-by: default avatarRaz Ben Yehuda <raziebe@gmail.com>
      Signed-off-by: default avatarMel Gorman <mgorman@suse.de>
      Reviewed-by: default avatarRik van Riel <riel@redhat.com>
      Reviewed-by: default avatarAndrea Arcangeli <aarcange@redhat.com>
      Reviewed-by: default avatarMinchan Kim <minchan.kim@gmail.com>
      Acked-by: default avatarJohannes Weiner <hannes@cmpxchg.org>
      Cc: <stable@kernel.org>		[2.6.38.x]
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cc03638d