Merge branch 'perfcounters/urgent' into perfcounters/core

Merge reason: We are going to modify a place modified by
              perfcounters/urgent.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 6 insertions, 3 deletions

diff --git a/kernel/module.c b/kernel/module.c
index fd1411403558..eccb561dd8a3 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -909,16 +909,18 @@ void __symbol_put(const char *symbol)
 }
 EXPORT_SYMBOL(__symbol_put);
 
+/* Note this assumes addr is a function, which it currently always is. */
 void symbol_put_addr(void *addr)
 {
         struct module *modaddr;
+        unsigned long a = (unsigned long)dereference_function_descriptor(addr);
 
-        if (core_kernel_text((unsigned long)addr))
+        if (core_kernel_text(a))
                 return;
 
         /* module_text_address is safe here: we're supposed to have reference
          * to module from symbol_get, so it can't go away. */
-        modaddr = __module_text_address((unsigned long)addr);
+        modaddr = __module_text_address(a);
         BUG_ON(!modaddr);
         module_put(modaddr);
 }
@@ -2353,7 +2355,8 @@ static noinline struct module *load_module(void __user *umod,
         if (err < 0)
                 goto unlink;
         add_sect_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
-        add_notes_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
+        if (mod->sect_attrs)
+                add_notes_attrs(mod, hdr->e_shnum, secstrings, sechdrs);
 
         /* Get rid of temporary copy */
         vfree(hdr);