Merge branch 'next' into for-linus

Prepare first round of input updates for 3.18.

1 files changed, 4 insertions, 2 deletions

diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h
index 560ca53a75fa..7eeb9bbfb816 100644
--- a/include/linux/moduleloader.h
+++ b/include/linux/moduleloader.h
@@ -45,7 +45,8 @@ static inline int apply_relocate(Elf_Shdr *sechdrs,
                                  unsigned int relsec,
                                  struct module *me)
 {
-        printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
+        printk(KERN_ERR "module %s: REL relocation unsupported\n",
+               module_name(me));
         return -ENOEXEC;
 }
 #endif
@@ -67,7 +68,8 @@ static inline int apply_relocate_add(Elf_Shdr *sechdrs,
                                      unsigned int relsec,
                                      struct module *me)
 {
-        printk(KERN_ERR "module %s: REL relocation unsupported\n", me->name);
+        printk(KERN_ERR "module %s: REL relocation unsupported\n",
+               module_name(me));
         return -ENOEXEC;
 }
 #endif