diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-29 14:28:08 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2009-07-29 14:28:08 -0400 |
| commit | b4093d6235b7e4249616651ee328600ced48a18a (patch) | |
| tree | 9f5b8e466e2d26fbe13ee7934f9e939a09815bd5 /kernel/module.c | |
| parent | d9ab77161d811ffb0bccf396f7155cc905c1b9e1 (diff) | |
| parent | 7d3e91b8a1f5179d56a7412d4b499f2d5fc6b25d (diff) | |
Merge branch 'master' into for-linus
Diffstat (limited to 'kernel/module.c')
| -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, | |||
| 1068 | { | 1068 | { |
| 1069 | const unsigned long *crc; | 1069 | const unsigned long *crc; |
| 1070 | 1070 | ||
| 1071 | if (!find_symbol("module_layout", NULL, &crc, true, false)) | 1071 | if (!find_symbol(MODULE_SYMBOL_PREFIX "module_layout", NULL, |
| 1072 | &crc, true, false)) | ||
| 1072 | BUG(); | 1073 | BUG(); |
| 1073 | return check_version(sechdrs, versindex, "module_layout", mod, crc); | 1074 | return check_version(sechdrs, versindex, "module_layout", mod, crc); |
| 1074 | } | 1075 | } |