Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/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.

This commit is contained in:

Linus Torvalds

2013-02-25 15:41:43 -08:00

parent ab7826595e d9d8d7ed49

commit 9043a2650c

43 changed files with 236 additions and 202 deletions

									
										kernel/sched/core.c
									
		+1
		-1
	
												View File
												
				@@ -2796,7 +2796,7 @@ static noinline void __schedule_bug(struct task_struct *prev)

					if (irqs_disabled())

						print_irqtrace_events(prev);

					dump_stack();

					add_taint(TAINT_WARN);

					add_taint(TAINT_WARN, LOCKDEP_STILL_OK);

				}

				/*