aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arc/include
diff options
context:
space:
mode:
authorVineet Gupta <vgupta@synopsys.com>2017-01-16 10:48:09 -0800
committerVineet Gupta <vgupta@synopsys.com>2017-01-18 11:17:44 -0800
commiteb1357d942e5d96de6b4c20a8ffa55acf96233a2 (patch)
tree623f34743d7fbfafb97dc8a6e7c9990f9a7f4ac3 /arch/arc/include
parentARCv2: save r30 on kernel entry as gcc uses it for code-gen (diff)
downloadlinux-dev-eb1357d942e5d96de6b4c20a8ffa55acf96233a2.tar.xz
linux-dev-eb1357d942e5d96de6b4c20a8ffa55acf96233a2.zip
ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds
commit d65283f7b695b5 added mod->arch.secstr under CONFIG_ARC_DW2_UNWIND, but used it unconditionally which broke builds when the option was disabled. Fix that by adjusting the #ifdef guard. And while at it add a missing guard (for unwinder) in module.c as well Reported-by: Waldemar Brodkorb <wbx@openadk.org> Cc: stable@vger.kernel.org #4.9 Fixes: d65283f7b695b5 ("ARC: module: elide loop to save reference to .eh_frame") Tested-by: Anton Kolesov <akolesov@synopsys.com> Reviewed-by: Alexey Brodkin <abrodkin@synopsys.com> [abrodkin: provided fixlet to Kconfig per failure in allnoconfig build] Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc/include')
-rw-r--r--arch/arc/include/asm/module.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arc/include/asm/module.h b/arch/arc/include/asm/module.h
index 6e91d8b339c3..567590ea8f6c 100644
--- a/arch/arc/include/asm/module.h
+++ b/arch/arc/include/asm/module.h
@@ -14,13 +14,13 @@
#include <asm-generic/module.h>
-#ifdef CONFIG_ARC_DW2_UNWIND
struct mod_arch_specific {
+#ifdef CONFIG_ARC_DW2_UNWIND
void *unw_info;
int unw_sec_idx;
+#endif
const char *secstr;
};
-#endif
#define MODULE_PROC_FAMILY "ARC700"