diff options
| author | From: Mel Gorman | 2009-09-24 00:56:05 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2009-09-24 16:20:56 +0200 |
| commit | ef1ff6b8c08954bc203b59e887d1e580dd91755a (patch) | |
| tree | 6bffcfc02cb57087362defe4cf045c6f70f62a6d /kernel/time | |
| parent | ksm: change default values to better fit into mainline kernel (diff) | |
| download | kernel-qcow2-linux-ef1ff6b8c08954bc203b59e887d1e580dd91755a.tar.gz kernel-qcow2-linux-ef1ff6b8c08954bc203b59e887d1e580dd91755a.tar.xz kernel-qcow2-linux-ef1ff6b8c08954bc203b59e887d1e580dd91755a.zip | |
hugetlbfs: do not call user_shm_lock() for MAP_HUGETLB fix
Commit 6bfde05bf5c ("hugetlbfs: allow the creation of files suitable for
MAP_PRIVATE on the vfs internal mount") altered can_do_hugetlb_shm() to
check if a file is being created for shared memory or mmap(). If this
returns false, we then unconditionally call user_shm_lock() triggering a
warning. This block should never be entered for MAP_HUGETLB. This
patch partially reverts the problem and fixes the check.
Signed-off-by: Eric B Munson <ebmunson@us.ibm.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Adam Litke <agl@us.ibm.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Lee Schermerhorn <lee.schermerhorn@hp.com>
Cc: Nick Piggin <nickpiggin@yahoo.com.au>
Cc: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/time')
0 files changed, 0 insertions, 0 deletions