Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 28839855 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

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

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  smp_call_function_single(): be slightly less stupid, fix #2
  lockdep, mm: fix might_fault() annotation
parents ccbf04f2 6e962814

kernel/up.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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