summaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm/module.h
diff options
context:
space:
mode:
authorPhil Carmody <ext-phil.2.carmody@nokia.com>2010-08-19 15:16:37 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-09-02 15:31:35 +0100
commite5f7772eec3ec342ecfe686ab8330ef538af134b (patch)
treee504f9e7278913ebdee6ff8cbc84fad0bf34a237 /arch/arm/include/asm/module.h
parent5793432628ad76f93ae4d31c23fb1c26e3d8b525 (diff)
downloadblackbird-op-linux-e5f7772eec3ec342ecfe686ab8330ef538af134b.tar.gz
blackbird-op-linux-e5f7772eec3ec342ecfe686ab8330ef538af134b.zip
ARM: 6339/1: module - simplify unwind table handling
The various sections are all dealt with similarly, so factor out that common behaviour. (Incorporating Peter Huewe's fix.) Cc: Peter Huewe <peterhuewe@gmx.de> Signed-off-by: Phil Carmody <ext-phil.2.carmody@nokia.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/module.h')
-rw-r--r--arch/arm/include/asm/module.h29
1 files changed, 17 insertions, 12 deletions
diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h
index e4dfa69abb68..6dcff0f7f8d7 100644
--- a/arch/arm/include/asm/module.h
+++ b/arch/arm/include/asm/module.h
@@ -7,20 +7,25 @@
struct unwind_table;
-struct mod_arch_specific
-{
#ifdef CONFIG_ARM_UNWIND
- Elf_Shdr *unw_sec_init;
- Elf_Shdr *unw_sec_devinit;
- Elf_Shdr *unw_sec_core;
- Elf_Shdr *sec_init_text;
- Elf_Shdr *sec_devinit_text;
- Elf_Shdr *sec_core_text;
- struct unwind_table *unwind_init;
- struct unwind_table *unwind_devinit;
- struct unwind_table *unwind_core;
-#endif
+struct arm_unwind_mapping {
+ Elf_Shdr *unw_sec;
+ Elf_Shdr *sec_text;
+ struct unwind_table *unwind;
+};
+enum {
+ ARM_SEC_INIT,
+ ARM_SEC_DEVINIT,
+ ARM_SEC_CORE,
+ ARM_SEC_MAX,
+};
+struct mod_arch_specific {
+ struct arm_unwind_mapping map[ARM_SEC_MAX];
};
+#else
+struct mod_arch_specific {
+};
+#endif
/*
* Include the ARM architecture version.
OpenPOWER on IntegriCloud