Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq

[pandora-kernel.git] / arch / arm / include / asm / module.h

diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h
index 24b168d..cbb0bc2 100644 (file)
--- a/arch/arm/include/asm/module.h
+++ b/arch/arm/include/asm/module.h
@@ -1,15 +1,34 @@
 #ifndef _ASM_ARM_MODULE_H
 #define _ASM_ARM_MODULE_H
 
-struct mod_arch_specific
-{
-       int foo;
-};
-
 #define Elf_Shdr       Elf32_Shdr
 #define Elf_Sym                Elf32_Sym
 #define Elf_Ehdr       Elf32_Ehdr
 
+struct unwind_table;
+
+#ifdef CONFIG_ARM_UNWIND
+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_EXIT,
+       ARM_SEC_DEVEXIT,
+       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.
  */