aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuke Yang <luke.adi@gmail.com>2006-03-02 05:35:31 -0500
committerSam Ravnborg <sam@mars.ravnborg.org>2006-03-08 12:33:16 -0500
commitf7b05e64bdb2fcc4b2dc94a4bd9426adc70c9599 (patch)
tree04becffd433c54a0f5a94c32ee7f23d40aff251b
parent4f1933620f57145212cdbb1ac6ce099eeeb21c5a (diff)
kbuild: Fix bug in crc symbol generating of kernel and modules
The scripts/genksyms/genksyms.c uses hardcoded "__crc_" prefix for crc symbols in kernel and modules. The prefix should be replaced by "MODULE_SYMBOL_PREFIX##__crc_" otherwise there will be warnings when MODULE_SYMBOL_PREFIX is not NULL. I am sorry my last patch for this issue is actually wrong. I revert it in this patch. Signed-off-by: Luke Yang <luke.adi@gmail.com> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r--scripts/genksyms/genksyms.c4
-rw-r--r--scripts/mod/modpost.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index 416a694b0998..ef8822e59cda 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -32,7 +32,7 @@
32#endif /* __GNU_LIBRARY__ */ 32#endif /* __GNU_LIBRARY__ */
33 33
34#include "genksyms.h" 34#include "genksyms.h"
35 35#include "../mod/elfconfig.h"
36/*----------------------------------------------------------------------*/ 36/*----------------------------------------------------------------------*/
37 37
38#define HASH_BUCKETS 4096 38#define HASH_BUCKETS 4096
@@ -458,7 +458,7 @@ export_symbol(const char *name)
458 fputs(">\n", debugfile); 458 fputs(">\n", debugfile);
459 459
460 /* Used as a linker script. */ 460 /* Used as a linker script. */
461 printf("__crc_%s = 0x%08lx ;\n", name, crc); 461 printf("%s__crc_%s = 0x%08lx ;\n", MODULE_SYMBOL_PREFIX, name, crc);
462 } 462 }
463} 463}
464 464
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index e2bf4c927dd3..30f3ac8eb43c 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -346,8 +346,8 @@ static void parse_elf_finish(struct elf_info *info)
346 release_file(info->hdr, info->size); 346 release_file(info->hdr, info->size);
347} 347}
348 348
349#define CRC_PFX "__crc_" 349#define CRC_PFX MODULE_SYMBOL_PREFIX "__crc_"
350#define KSYMTAB_PFX "__ksymtab_" 350#define KSYMTAB_PFX MODULE_SYMBOL_PREFIX "__ksymtab_"
351 351
352static void handle_modversions(struct module *mod, struct elf_info *info, 352static void handle_modversions(struct module *mod, struct elf_info *info,
353 Elf_Sym *sym, const char *symname) 353 Elf_Sym *sym, const char *symname)