Patch "ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 23, 2017

Subsystems (2)

Stable branch Synopsys ARC architecture

lore

Share & tools

lore

[email protected]

author maintainer Applied

2017-01-23 14:35 UTC #0 lore raw

This is a note to let you know that I've just added the patch titled

ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arc-module-fix-config_arc_dw2_unwind-builds.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From eb1357d942e5d96de6b4c20a8ffa55acf96233a2 Mon Sep 17 00:00:00 2001

From: Vineet Gupta <[email protected]>
Date: Mon, 16 Jan 2017 10:48:09 -0800
Subject: ARC: module: Fix !CONFIG_ARC_DW2_UNWIND builds

From: Vineet Gupta <[email protected]>

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 <[email protected]>

Fixes d65283f7b695b5 ("ARC: module: elide loop to save reference to .eh_frame")

Tested-by Anton Kolesov <[email protected]>

Reviewed-by Alexey Brodkin <[email protected]>

[abrodkin: provided fixlet to Kconfig per failure in allnoconfig build]

Signed-off-by Vineet Gupta <[email protected]>

Signed-off-by Greg Kroah-Hartman <[email protected]>

---
 arch/arc/Kconfig              |    2 +-
 arch/arc/include/asm/module.h |    4 ++--
 arch/arc/kernel/module.c      |    4 +++-
 3 files changed, 6 insertions(+), 4 deletions(-)

arch/arc/Kconfig +1 -1

@@ -28,7 +28,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

arch/arc/include/asm/module.h +2 -2

@@ -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"

arch/arc/kernel/module.c +3 -1

@@ -32,8 +32,8 @@ int module_frob_arch_sections(Elf_Ehdr *
 #ifdef CONFIG_ARC_DW2_UNWIND
 	mod->arch.unw_sec_idx = 0;
 	mod->arch.unw_info = NULL;
-	mod->arch.secstr = secstr;
 #endif
+	mod->arch.secstr = secstr;
 	return 0;
 }

@@ -113,8 +113,10 @@ int apply_relocate_add(Elf32_Shdr *sechd
 
 	}
 
+#ifdef CONFIG_ARC_DW2_UNWIND
 	if (strcmp(module->arch.secstr+sechdrs[tgtsec].sh_name, ".eh_frame") == 0)
 		module->arch.unw_sec_idx = tgtsec;
+#endif
 
 	return 0;

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/arc-module-fix-config_arc_dw2_unwind-builds.patch