From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 25 Feb 2013 23:41:43 +0000 (-0800)
Subject: Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.9-rc1~91
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9043a2650cd21f96f831a97f516c2c302e21fb70;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge tag 'modules-next-for-linus' of git://git./linux/kernel/git/rusty/linux

Pull module update from Rusty Russell:
 "The sweeping change is to make add_taint() explicitly indicate whether
  to disable lockdep, but it's a mechanical change."

* tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
  MODSIGN: Add option to not sign modules during modules_install
  MODSIGN: Add -s <signature> option to sign-file
  MODSIGN: Specify the hash algorithm on sign-file command line
  MODSIGN: Simplify Makefile with a Kconfig helper
  module: clean up load_module a little more.
  modpost: Ignore ARC specific non-alloc sections
  module: constify within_module_*
  taint: add explicit flag to show whether lock dep is still OK.
  module: printk message when module signature fail taints kernel.
---

9043a2650cd21f96f831a97f516c2c302e21fb70
diff --cc mm/page_alloc.c
index e9075fd,4c99cb7..0dade3f
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@@ -332,8 -319,8 +332,8 @@@ static void bad_page(struct page *page
  	dump_stack();
  out:
  	/* Leave bad fields for debug, except PageBuddy could make trouble */
 -	reset_page_mapcount(page); /* remove PageBuddy */
 +	page_mapcount_reset(page); /* remove PageBuddy */
- 	add_taint(TAINT_BAD_PAGE);
+ 	add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE);
  }
  
  /*