diff options
| author | Mike Frysinger <[email protected]> | 2009-07-23 14:12:08 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2009-07-27 19:15:45 +0000 |
| commit | 6560dc160f3a96b8f1f43e2c6b51aa6eb9898b90 (patch) | |
| tree | f6cd276df257ab3784a6eb3c47728c09f5d872e3 | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff) | |
| download | kernel-6560dc160f3a96b8f1f43e2c6b51aa6eb9898b90.tar.gz kernel-6560dc160f3a96b8f1f43e2c6b51aa6eb9898b90.zip | |
module: use MODULE_SYMBOL_PREFIX with module_layout
The check_modstruct_version() needs to look up the symbol "module_layout"
in the kernel, but it does so literally and not by a C identifier. The
trouble is that it does not include a symbol prefix for those ports that
need it (like the Blackfin and H8300 port). So make sure we tack on the
MODULE_SYMBOL_PREFIX define to the front of it.
Signed-off-by: Mike Frysinger <[email protected]>
Signed-off-by: Rusty Russell <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
| -rw-r--r-- | kernel/module.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/module.c b/kernel/module.c index 0a049837008e..fd1411403558 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -1068,7 +1068,8 @@ static inline int check_modstruct_version(Elf_Shdr *sechdrs, { const unsigned long *crc; - if (!find_symbol("module_layout", NULL, &crc, true, false)) + if (!find_symbol(MODULE_SYMBOL_PREFIX "module_layout", NULL, + &crc, true, false)) BUG(); return check_version(sechdrs, versindex, "module_layout", mod, crc); } |