Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus

1 files changed, 20 insertions, 18 deletions

diff --git a/kernel/module.c b/kernel/module.c
index bd60278ee703..92595bad3812 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -46,6 +46,7 @@
 #include <asm/semaphore.h>
 #include <asm/cacheflush.h>
 #include <linux/license.h>
+#include <asm/sections.h>
 
 #if 0
 #define DEBUGP printk
@@ -290,7 +291,7 @@ static unsigned long __find_symbol(const char *name,
                 }
         }
         DEBUGP("Failed to find symbol %s\n", name);
-        return 0;
+        return -ENOENT;
 }
 
 /* Search for module by name: must hold module_mutex. */
@@ -343,9 +344,6 @@ static inline unsigned int block_size(int val)
         return val;
 }
 
-/* Created by linker magic */
-extern char __per_cpu_start[], __per_cpu_end[];
-
 static void *percpu_modalloc(unsigned long size, unsigned long align,
                              const char *name)
 {
@@ -783,7 +781,7 @@ void __symbol_put(const char *symbol)
         const unsigned long *crc;
 
         preempt_disable();
-        if (!__find_symbol(symbol, &owner, &crc, 1))
+        if (IS_ERR_VALUE(__find_symbol(symbol, &owner, &crc, 1)))
                 BUG();
         module_put(owner);
         preempt_enable();
@@ -929,7 +927,8 @@ static inline int check_modstruct_version(Elf_Shdr *sechdrs,
         const unsigned long *crc;
         struct module *owner;
 
-        if (!__find_symbol("struct_module", &owner, &crc, 1))
+        if (IS_ERR_VALUE(__find_symbol("struct_module",
+                                                &owner, &crc, 1)))
                 BUG();
         return check_version(sechdrs, versindex, "struct_module", mod,
                              crc);
@@ -978,12 +977,12 @@ static unsigned long resolve_symbol(Elf_Shdr *sechdrs,
 
         ret = __find_symbol(name, &owner, &crc,
                         !(mod->taints & TAINT_PROPRIETARY_MODULE));
-        if (ret) {
+        if (!IS_ERR_VALUE(ret)) {
                 /* use_module can fail due to OOM,
                    or module initialization or unloading */
                 if (!check_version(sechdrs, versindex, name, mod, crc) ||
                     !use_module(mod, owner))
-                        ret = 0;
+                        ret = -EINVAL;
         }
         return ret;
 }
@@ -1371,7 +1370,9 @@ void *__symbol_get(const char *symbol)
 
         preempt_disable();
         value = __find_symbol(symbol, &owner, &crc, 1);
-        if (value && strong_try_module_get(owner) != 0)
+        if (IS_ERR_VALUE(value))
+                value = 0;
+        else if (strong_try_module_get(owner))
                 value = 0;
         preempt_enable();
 
@@ -1391,14 +1392,16 @@ static int verify_export_symbols(struct module *mod)
         const unsigned long *crc;
 
         for (i = 0; i < mod->num_syms; i++)
-                if (__find_symbol(mod->syms[i].name, &owner, &crc, 1)) {
+                if (!IS_ERR_VALUE(__find_symbol(mod->syms[i].name,
+                                                        &owner, &crc, 1))) {
                         name = mod->syms[i].name;
                         ret = -ENOEXEC;
                         goto dup;
                 }
 
         for (i = 0; i < mod->num_gpl_syms; i++)
-                if (__find_symbol(mod->gpl_syms[i].name, &owner, &crc, 1)) {
+                if (!IS_ERR_VALUE(__find_symbol(mod->gpl_syms[i].name,
+                                                        &owner, &crc, 1))) {
                         name = mod->gpl_syms[i].name;
                         ret = -ENOEXEC;
                         goto dup;
@@ -1448,7 +1451,7 @@ static int simplify_symbols(Elf_Shdr *sechdrs,
                                            strtab + sym[i].st_name, mod);
 
                         /* Ok if resolved.  */
-                        if (sym[i].st_value != 0)
+                        if (!IS_ERR_VALUE(sym[i].st_value))
                                 break;
                         /* Ok if weak.  */
                         if (ELF_ST_BIND(sym[i].st_info) == STB_WEAK)
@@ -2035,7 +2038,7 @@ static struct module *load_module(void __user *umod,
 #ifdef CONFIG_MARKERS
         if (!mod->taints)
                 marker_update_probe_range(mod->markers,
-                        mod->markers + mod->num_markers, NULL, NULL);
+                        mod->markers + mod->num_markers);
 #endif
         err = module_finalize(hdr, sechdrs, mod);
         if (err < 0)
@@ -2250,7 +2253,7 @@ static const char *get_ksymbol(struct module *mod,
 
 /* For kallsyms to ask for address resolution.  NULL means not found.  Careful
  * not to lock to avoid deadlock on oopses, simply disable preemption. */
-char *module_address_lookup(unsigned long addr,
+const char *module_address_lookup(unsigned long addr,
                             unsigned long *size,
                             unsigned long *offset,
                             char **modname,
@@ -2275,7 +2278,7 @@ char *module_address_lookup(unsigned long addr,
                 ret = namebuf;
         }
         preempt_enable();
-        return (char *)ret;
+        return ret;
 }
 
 int lookup_module_symbol_name(unsigned long addr, char *symname)
@@ -2561,7 +2564,7 @@ EXPORT_SYMBOL(struct_module);
 #endif
 
 #ifdef CONFIG_MARKERS
-void module_update_markers(struct module *probe_module, int *refcount)
+void module_update_markers(void)
 {
         struct module *mod;
 
@@ -2569,8 +2572,7 @@ void module_update_markers(struct module *probe_module, int *refcount)
         list_for_each_entry(mod, &modules, list)
                 if (!mod->taints)
                         marker_update_probe_range(mod->markers,
-                                mod->markers + mod->num_markers,
-                                probe_module, refcount);
+                                mod->markers + mod->num_markers);
         mutex_unlock(&module_mutex);
 }
 #endif