X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=mm%2Fmemory.c;h=6666bc20b3c61fa8134b070cd46c7b9193cc6999;hb=194dfe88d62ed12d0cf30f6f20734c2d0d111533;hp=7c40850b7124eb190f1dc345b801e1234b740d78;hpb=78383162605e22a2aad88e417bb8fcaf808f147a;p=uclinux-h8%2Flinux.git

diff --git a/mm/memory.c b/mm/memory.c
index 7c40850b7124..6666bc20b3c6 100644
--- a/mm/memory.c
+++ b/mm/memory.c
@@ -5255,14 +5255,6 @@ void print_vma_addr(char *prefix, unsigned long ip)
 #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_DEBUG_ATOMIC_SLEEP)
 void __might_fault(const char *file, int line)
 {
-	/*
-	 * Some code (nfs/sunrpc) uses socket ops on kernel memory while
-	 * holding the mmap_lock, this is safe because kernel memory doesn't
-	 * get paged out, therefore we'll never actually fault, and the
-	 * below annotations will generate false positives.
-	 */
-	if (uaccess_kernel())
-		return;
 	if (pagefault_disabled())
 		return;
 	__might_sleep(file, line);