Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7b05e64 authored by Luke Yang's avatar Luke Yang Committed by Sam Ravnborg
Browse files

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: default avatarLuke Yang <luke.adi@gmail.com>
Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
parent 4f193362

scripts/genksyms/genksyms.c

+2 −2
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 
#endif /* __GNU_LIBRARY__ */



#include "genksyms.h"



#include "../mod/elfconfig.h"

/*----------------------------------------------------------------------*/



#define HASH_BUCKETS  4096
@@ -458,7 +458,7 @@ export_symbol(const char *name) 
	fputs(">\n", debugfile);



      /* Used as a linker script. */

      printf("__crc_%s = 0x%08lx ;\n", name, crc);

      printf("%s__crc_%s = 0x%08lx ;\n", MODULE_SYMBOL_PREFIX, name, crc);

    }

}

scripts/mod/modpost.c

+2 −2
Original line number Diff line number Diff line
@@ -346,8 +346,8 @@ static void parse_elf_finish(struct elf_info *info) 
	release_file(info->hdr, info->size);

}



#define CRC_PFX     "__crc_"

#define KSYMTAB_PFX "__ksymtab_"

#define CRC_PFX     MODULE_SYMBOL_PREFIX "__crc_"

#define KSYMTAB_PFX MODULE_SYMBOL_PREFIX "__ksymtab_"



static void handle_modversions(struct module *mod, struct elf_info *info,

			       Elf_Sym *sym, const char *symname)