diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 03:36:52 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-05 03:36:52 +0300 |
| commit | 25c862cc9ea9b312c25a9f577f91b973131f1261 (patch) | |
| tree | 8e8f56531144370ced50fa98db2973f4e93e38b0 /scripts/mod/modpost.c | |
| parent | 52347f4e810ba323d02cd2c26b5d738f4a2c3d5e (diff) | |
| parent | 8ded4ac018ea706bf7ee926601a27184665c9c28 (diff) | |
| download | linux-25c862cc9ea9b312c25a9f577f91b973131f1261.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'scripts/mod/modpost.c')
| -rw-r--r-- | scripts/mod/modpost.c | 7 |
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) |