From e34fb1b17d543379a37091eb0215a34fe6c031ad Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Fri, 27 Aug 2021 13:35:51 -0400 Subject: [PATCH] Fixes for 4.9 Signed-off-by: Sasha Levin --- queue-4.9/arc-fix-config_stackdepot.patch | 47 +++++++++++++++++++++++ queue-4.9/series | 1 + 2 files changed, 48 insertions(+) create mode 100644 queue-4.9/arc-fix-config_stackdepot.patch diff --git a/queue-4.9/arc-fix-config_stackdepot.patch b/queue-4.9/arc-fix-config_stackdepot.patch new file mode 100644 index 00000000000..15e961bb68b --- /dev/null +++ b/queue-4.9/arc-fix-config_stackdepot.patch @@ -0,0 +1,47 @@ +From 44b97a8d8aa08751dea1b92fdebfc8395f0bec50 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sat, 10 Jul 2021 07:50:33 -0700 +Subject: ARC: Fix CONFIG_STACKDEPOT + +From: Guenter Roeck + +[ Upstream commit bf79167fd86f3b97390fe2e70231d383526bd9cc ] + +Enabling CONFIG_STACKDEPOT results in the following build error. + +arc-elf-ld: lib/stackdepot.o: in function `filter_irq_stacks': +stackdepot.c:(.text+0x456): undefined reference to `__irqentry_text_start' +arc-elf-ld: stackdepot.c:(.text+0x456): undefined reference to `__irqentry_text_start' +arc-elf-ld: stackdepot.c:(.text+0x476): undefined reference to `__irqentry_text_end' +arc-elf-ld: stackdepot.c:(.text+0x476): undefined reference to `__irqentry_text_end' +arc-elf-ld: stackdepot.c:(.text+0x484): undefined reference to `__softirqentry_text_start' +arc-elf-ld: stackdepot.c:(.text+0x484): undefined reference to `__softirqentry_text_start' +arc-elf-ld: stackdepot.c:(.text+0x48c): undefined reference to `__softirqentry_text_end' +arc-elf-ld: stackdepot.c:(.text+0x48c): undefined reference to `__softirqentry_text_end' + +Other architectures address this problem by adding IRQENTRY_TEXT and +SOFTIRQENTRY_TEXT to the text segment, so do the same here. + +Signed-off-by: Guenter Roeck +Signed-off-by: Vineet Gupta +Signed-off-by: Sasha Levin +--- + arch/arc/kernel/vmlinux.lds.S | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/arch/arc/kernel/vmlinux.lds.S b/arch/arc/kernel/vmlinux.lds.S +index f35ed578e007..4d823d3f65bb 100644 +--- a/arch/arc/kernel/vmlinux.lds.S ++++ b/arch/arc/kernel/vmlinux.lds.S +@@ -92,6 +92,8 @@ SECTIONS + CPUIDLE_TEXT + LOCK_TEXT + KPROBES_TEXT ++ IRQENTRY_TEXT ++ SOFTIRQENTRY_TEXT + *(.fixup) + *(.gnu.warning) + } +-- +2.30.2 + diff --git a/queue-4.9/series b/queue-4.9/series index e69de29bb2d..2a155f231ff 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -0,0 +1 @@ +arc-fix-config_stackdepot.patch -- 2.47.3