1. 10 5月, 2011 18 次提交
  2. 09 5月, 2011 10 次提交
  3. 08 5月, 2011 1 次提交
  4. 07 5月, 2011 4 次提交
  5. 06 5月, 2011 5 次提交
  6. 05 5月, 2011 2 次提交
    • L
      VM: skip the stack guard page lookup in get_user_pages only for mlock · a1fde08c
      Linus Torvalds 提交于
      The logic in __get_user_pages() used to skip the stack guard page lookup
      whenever the caller wasn't interested in seeing what the actual page
      was.  But Michel Lespinasse points out that there are cases where we
      don't care about the physical page itself (so 'pages' may be NULL), but
      do want to make sure a page is mapped into the virtual address space.
      
      So using the existence of the "pages" array as an indication of whether
      to look up the guard page or not isn't actually so great, and we really
      should just use the FOLL_MLOCK bit.  But because that bit was only set
      for the VM_LOCKED case (and not all vma's necessarily have it, even for
      mlock()), we couldn't do that originally.
      
      Fix that by moving the VM_LOCKED check deeper into the call-chain, which
      actually simplifies many things.  Now mlock() gets simpler, and we can
      also check for FOLL_MLOCK in __get_user_pages() and the code ends up
      much more straightforward.
      Reported-and-reviewed-by: NMichel Lespinasse <walken@google.com>
      Cc: stable@kernel.org
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a1fde08c
    • L
      Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 · 5895198c
      Linus Torvalds 提交于
      * 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
        staging: Remove a warning for drivers/staging/wlan-ng/cfg80211.c
        staging: intel_sst: intelmid needs delay.h
        staging: solo6x10: add select SND_PCM to fix build error
        staging: usbip: vhci: fix oops on subsequent attach
        staging: ft1000: Remove unnecessary EXPORT_SYMBOLs
        staging: rts_pstor: use #ifdef instead of #if
        staging: rts_pstor: Add <linux/vmalloc.h>
        staging: gma500: Depend on X86
        staging: olpc: Add <linux/delay.h>
      5895198c