Skip to contentSkip to conversation

ARC: fix allnoconfig builds

PATCH In review Alexey Brodkin 2 participants 2 messages Jan 18, 2017 Synopsys ARC architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARC: fix allnoconfig builds

In case of allnoconfig HAVE_MOD_ARCH_SPECIFIC=no
because ARC_DW2_UNWIND=no as well.

This enables default "struct mod_arch_specific" from ./include/asm-generic/module.h which clashes with ARC's one.

Before e514943bbfe1 ("ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds") ARC's "struct mod_arch_specific" was hidden for !CONFIG_ARC_DW2_UNWIND builds but not anymore.

So to make our life easier and escape more complicated ifdeffed constructions in sources let's unconditionally select CONFIG_HAVE_MOD_ARCH_SPECIFIC for ARC.

Reported-by Anton Kolesov <akolesov at synopsys.com>
Fixes e514943bbfe1 ("ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds")
Signed-off-by Alexey Brodkin <abrodkin at synopsys.com>
---
 arch/arc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arc/Kconfig +1 -1
index c75d290..283099c 100644
@@ -29,7 +29,7 @@ config ARC
 	select HAVE_KPROBES
 	select HAVE_KRETPROBES
 	select HAVE_MEMBLOCK
-	select HAVE_MOD_ARCH_SPECIFIC if ARC_DW2_UNWIND
+	select HAVE_MOD_ARCH_SPECIFIC
 	select HAVE_OPROFILE
 	select HAVE_PERF_EVENTS
 	select HANDLE_DOMAIN_IRQ
Signature · 1 line
2.10.2
#1 lore raw
Quoted 10 lines · Alexey Brodkin

In case of allnoconfig HAVE_MOD_ARCH_SPECIFIC=no
because ARC_DW2_UNWIND=no as well.

This enables default "struct mod_arch_specific" from ./include/asm-generic/module.h which clashes with ARC's one.

Before e514943bbfe1 ("ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds") ARC's "struct mod_arch_specific" was hidden for !CONFIG_ARC_DW2_UNWIND builds but not anymore.

Quoted 6 lines

So to make our life easier and escape more complicated ifdeffed constructions in sources let's unconditionally select CONFIG_HAVE_MOD_ARCH_SPECIFIC for ARC.

Reported-by Anton Kolesov <akolesov at synopsys.com>
Fixes e514943bbfe1 ("ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds")
Signed-off-by Alexey Brodkin <abrodkin at synopsys.com>

Thx for the fix Alexey. Since the offending patch is marked for stable inclusion and not yet hit upstream, I'll squash this with that and can add your Tested-by / Reviewed-by, SOB - which one would you prefer !

Thx,
-Vineet

Quoted 17 lines
---
 arch/arc/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arc/Kconfig +1 -1
index c75d290..283099c 100644
@@ -29,7 +29,7 @@ config ARC
 	select HAVE_KPROBES
 	select HAVE_KRETPROBES
 	select HAVE_MEMBLOCK
-	select HAVE_MOD_ARCH_SPECIFIC if ARC_DW2_UNWIND
+	select HAVE_MOD_ARCH_SPECIFIC
 	select HAVE_OPROFILE
 	select HAVE_PERF_EVENTS
 	select HANDLE_DOMAIN_IRQ