diff options
| author | Vineet Gupta <vgupta@synopsys.com> | 2017-01-16 13:48:09 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-26 02:24:37 -0500 |
| commit | bb82fb48df8cab8f902052ce03f6d51b9b8f1bcd (patch) | |
| tree | a9db5ddc8228cdefdca84db622184a4b45ba0b53 /arch/arc/include | |
| parent | 3c4d83a1a41efdf2c191d0072e6545e6bf8ecc94 (diff) | |
ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds
commit eb1357d942e5d96de6b4c20a8ffa55acf96233a2 upstream.
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>
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arc/include')
| -rw-r--r-- | arch/arc/include/asm/module.h | 4 |
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 @@ | |||
| 14 | 14 | ||
| 15 | #include <asm-generic/module.h> | 15 | #include <asm-generic/module.h> |
| 16 | 16 | ||
| 17 | #ifdef CONFIG_ARC_DW2_UNWIND | ||
| 18 | struct mod_arch_specific { | 17 | struct mod_arch_specific { |
| 18 | #ifdef CONFIG_ARC_DW2_UNWIND | ||
| 19 | void *unw_info; | 19 | void *unw_info; |
| 20 | int unw_sec_idx; | 20 | int unw_sec_idx; |
| 21 | #endif | ||
| 21 | const char *secstr; | 22 | const char *secstr; |
| 22 | }; | 23 | }; |
| 23 | #endif | ||
| 24 | 24 | ||
| 25 | #define MODULE_PROC_FAMILY "ARC700" | 25 | #define MODULE_PROC_FAMILY "ARC700" |
| 26 | 26 | ||
