diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-06 08:57:07 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-06 08:57:07 +0100 |
| commit | 81a63001862f92d47c8c40a7fad870d5fbd8680b (patch) | |
| tree | 21e45333a5501bec2ebc2ce46bb8847de5621814 /arch/arm/include | |
| parent | 301a36fa700f9add6e14f5a95c7573e01578343a (diff) | |
| parent | 32b63776931acc7dbaaf336a99dd7306a815a254 (diff) | |
| download | linux-81a63001862f92d47c8c40a7fad870d5fbd8680b.tar.gz linux-81a63001862f92d47c8c40a7fad870d5fbd8680b.tar.bz2 linux-81a63001862f92d47c8c40a7fad870d5fbd8680b.zip | |
Merge branch 'devel-stable' into for-linus
Diffstat (limited to 'arch/arm/include')
| -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 }; |