Skip to contentSkip to conversation

core fixes

GIT PULL Ingo Molnar 1 participant 1 message Jan 13, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest core-fixes-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git core-fixes-for-linus

Thanks,

Ingo

------------------>
Ingo Molnar (1):
smp_call_function_single(): be slightly less stupid, fix #2

Peter Zijlstra (1):
lockdep, mm: fix might_fault() annotation

 kernel/up.c |    1 +
 mm/memory.c |    9 +++++++++
 2 files changed, 10 insertions(+), 0 deletions(-)
kernel/up.c +1 -0
index c04b9dc..1ff27a2 100644
@@ -2,6 +2,7 @@
  * Uniprocessor-only support functions.  The counterpart to kernel/smp.c
  */
 
+#include <linux/interrupt.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/smp.h>
mm/memory.c +9 -0
index e009ce8..c2d4c47 100644
@@ -3165,6 +3165,15 @@ void print_vma_addr(char *prefix, unsigned long ip)
 #ifdef CONFIG_PROVE_LOCKING
 void might_fault(void)
 {
+	/*
+	 * Some code (nfs/sunrpc) uses socket ops on kernel memory while
+	 * holding the mmap_sem, 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 (segment_eq(get_fs(), KERNEL_DS))
+		return;
+
 	might_sleep();
 	/*
 	 * it would be nicer only to annotate paths which are not under