summaryrefslogtreecommitdiffstats
path: root/arch/arm/include
diff options
context:
space:
mode:
authorArd Biesheuvel <ard.biesheuvel@linaro.org>2016-08-16 17:21:02 +0200
committerArd Biesheuvel <ard.biesheuvel@linaro.org>2016-08-30 17:45:34 +0100
commit35fa91eed817d2c65c59ef5a9737011313be6ac0 (patch)
tree096f2f8bf219fb1b04f28c5fc104e6331c84695a /arch/arm/include
parent3eab887a55424fc2c27553b7bfe32330df83f7b8 (diff)
downloadlinux-35fa91eed817d2c65c59ef5a9737011313be6ac0.tar.gz
linux-35fa91eed817d2c65c59ef5a9737011313be6ac0.tar.bz2
linux-35fa91eed817d2c65c59ef5a9737011313be6ac0.zip
ARM: kernel: merge core and init PLTs
The PLT code uses a separate .init.plt section to allocate PLT entries for jump and call instructions in __init code. However, even for fairly sizable modules like mac80211.ko, we only end up with a couple of PLT entries in the .init section, and so we can simplify the code significantly by emitting all PLT entries into the same section. Tested-by: Jongsung Kim <neidhard.kim@lge.com> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Diffstat (limited to 'arch/arm/include')
-rw-r--r--arch/arm/include/asm/module.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h
index e358b7966c06..464748b9fd7d 100644
--- a/arch/arm/include/asm/module.h
+++ b/arch/arm/include/asm/module.h
@@ -23,10 +23,8 @@ struct mod_arch_specific {
struct unwind_table *unwind[ARM_SEC_MAX];
#endif
#ifdef CONFIG_ARM_MODULE_PLTS
- struct elf32_shdr *core_plt;
- struct elf32_shdr *init_plt;
- int core_plt_count;
- int init_plt_count;
+ struct elf32_shdr *plt;
+ int plt_count;
#endif
};