diff options
author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2017-02-03 04:54:07 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-02-03 11:28:25 -0500 |
commit | 4b9eee96fcb361a5e16a8d2619825e8a048f81f7 (patch) | |
tree | 1347fe88fba35018e2d9f14be79a7feb29e75151 /include/linux/export.h | |
parent | 71810db27c1c853b335675bee335d893bc3d324b (diff) |
module: unify absolute krctab definitions for 32-bit and 64-bit
The previous patch introduced a separate inline asm version of the
krcrctab declaration template for use with 64-bit architectures, which
cannot refer to ELF symbols using 32-bit quantities.
This declaration should be equivalent to the C one for 32-bit
architectures, but just in case - unify them in a separate patch, which
can simply be dropped if it turns out to break anything.
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/export.h')
-rw-r--r-- | include/linux/export.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/linux/export.h b/include/linux/export.h index 7473fba6a60c..1a1dfdb2a5c6 100644 --- a/include/linux/export.h +++ b/include/linux/export.h | |||
@@ -49,13 +49,6 @@ extern struct module __this_module; | |||
49 | " .weak " VMLINUX_SYMBOL_STR(__crc_##sym) " \n" \ | 49 | " .weak " VMLINUX_SYMBOL_STR(__crc_##sym) " \n" \ |
50 | " .long " VMLINUX_SYMBOL_STR(__crc_##sym) " - . \n" \ | 50 | " .long " VMLINUX_SYMBOL_STR(__crc_##sym) " - . \n" \ |
51 | " .previous \n"); | 51 | " .previous \n"); |
52 | #elif !defined(CONFIG_64BIT) | ||
53 | #define __CRC_SYMBOL(sym, sec) \ | ||
54 | extern __visible void *__crc_##sym __attribute__((weak)); \ | ||
55 | static const unsigned long __kcrctab_##sym \ | ||
56 | __used \ | ||
57 | __attribute__((section("___kcrctab" sec "+" #sym), used)) \ | ||
58 | = (unsigned long) &__crc_##sym; | ||
59 | #else | 52 | #else |
60 | #define __CRC_SYMBOL(sym, sec) \ | 53 | #define __CRC_SYMBOL(sym, sec) \ |
61 | asm(" .section \"___kcrctab" sec "+" #sym "\", \"a\" \n" \ | 54 | asm(" .section \"___kcrctab" sec "+" #sym "\", \"a\" \n" \ |