Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild

1 files changed, 3 insertions, 4 deletions

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 3bed09e625c0..f70ff13d4818 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -326,8 +326,8 @@ parse_elf_finish(struct elf_info *info)
         release_file(info->hdr, info->size);
 }
 
-#define CRC_PFX     MODULE_SYMBOL_PREFIX "__crc_"
-#define KSYMTAB_PFX MODULE_SYMBOL_PREFIX "__ksymtab_"
+#define CRC_PFX     "__crc_"
+#define KSYMTAB_PFX "__ksymtab_"
 
 void
 handle_modversions(struct module *mod, struct elf_info *info,
@@ -539,10 +539,9 @@ add_header(struct buffer *b, struct module *mod)
         buf_printf(b, "\n");
         buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
         buf_printf(b, "\n");
-        buf_printf(b, "#undef unix\n"); /* We have a module called "unix" */
         buf_printf(b, "struct module __this_module\n");
         buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
-        buf_printf(b, " .name = __stringify(KBUILD_MODNAME),\n");
+        buf_printf(b, " .name = KBUILD_MODNAME,\n");
         if (mod->has_init)
                 buf_printf(b, " .init = init_module,\n");
         if (mod->has_cleanup)