diff options
| author | Russell King | 2016-10-06 09:57:07 +0200 |
|---|---|---|
| committer | Russell King | 2016-10-06 09:57:07 +0200 |
| commit | 81a63001862f92d47c8c40a7fad870d5fbd8680b (patch) | |
| tree | 21e45333a5501bec2ebc2ce46bb8847de5621814 /arch/arm/include/asm | |
| parent | Merge branches 'misc' and 'sa1111-base' into for-linus (diff) | |
| parent | Merge tag 'arm-plt-optimizations-for-v4.9' of git://git.linaro.org/people/ard... (diff) | |
| download | kernel-qcow2-linux-81a63001862f92d47c8c40a7fad870d5fbd8680b.tar.gz kernel-qcow2-linux-81a63001862f92d47c8c40a7fad870d5fbd8680b.tar.xz kernel-qcow2-linux-81a63001862f92d47c8c40a7fad870d5fbd8680b.zip | |
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/module.h | 6 |
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 }; |