From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Apr 2009 17:30:21 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cab4e4c43f92582a2bfc026137b3d8a175bd0360;p=mv-sheeva.git

Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param

* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-module-and-param:
  module: use strstarts()
  strstarts: helper function for !strncmp(str, prefix, strlen(prefix))
  arm: allow usage of string functions in linux/string.h
  module: don't use stop_machine on module load
  module: create a request_module_nowait()
  module: include other structures in module version check
  module: remove the SHF_ALLOC flag on the __versions section.
  module: clarify the force-loading taint message.
  module: Export symbols needed for Ksplice
  Ksplice: Add functions for walking kallsyms symbols
  module: remove module_text_address()
  module: __module_address
  module: Make find_symbol return a struct kernel_symbol
  kernel/module.c: fix an unused goto label
  param: fix charp parameters set via sysfs

Fix trivial conflicts in kernel/extable.c manually.
---

cab4e4c43f92582a2bfc026137b3d8a175bd0360
diff --cc kernel/extable.c
index c46da6a4703,384f0da8a03..81e99d1f0d5
--- a/kernel/extable.c
+++ b/kernel/extable.c
@@@ -65,19 -58,7 +65,19 @@@ __notrace_funcgraph int __kernel_text_a
  {
  	if (core_kernel_text(addr))
  		return 1;
- 	if (__module_text_address(addr))
 -	return is_module_text_address(addr);
++	if (is_module_text_address(addr))
 +		return 1;
 +	/*
 +	 * There might be init symbols in saved stacktraces.
 +	 * Give those symbols a chance to be printed in
 +	 * backtraces (such as lockdep traces).
 +	 *
 +	 * Since we are after the module-symbols check, there's
 +	 * no danger of address overlap:
 +	 */
 +	if (init_kernel_text(addr))
 +		return 1;
 +	return 0;
  }
  
  int kernel_text_address(unsigned long addr)