Skip to content

Commit 28a372b

Browse files
committed
s390x: add patch reverting upstream commit fa1518875286
See: https://lore.kernel.org/bpf/your-ad-here.call-01743522822-ext-4975@work.hours/ Signed-off-by: Ihor Solodrai <ihor.solodrai@linux.dev>
1 parent c375d4c commit 28a372b

File tree

1 file changed

+38
-0
lines changed

1 file changed

+38
-0
lines changed
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
From df11fe822d2f44a80cdafb35db673b0bc7e602ab Mon Sep 17 00:00:00 2001
2+
From: Ihor Solodrai <ihor.solodrai@linux.dev>
3+
Date: Tue, 1 Apr 2025 10:35:55 -0700
4+
Subject: [PATCH] Revert "s390: Sort mcount locations at build time"
5+
6+
This reverts commit fa1518875286c94111bdaf1c7bae188c9c426c6b.
7+
---
8+
arch/s390/Kconfig | 1 -
9+
arch/s390/configs/debug_defconfig | 1 -
10+
2 files changed, 2 deletions(-)
11+
12+
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
13+
index 6412e39a795d..594a2993f5c6 100644
14+
--- a/arch/s390/Kconfig
15+
+++ b/arch/s390/Kconfig
16+
@@ -182,7 +182,6 @@ config S390
17+
select HAVE_ARCH_TRANSPARENT_HUGEPAGE
18+
select HAVE_ARCH_VMAP_STACK
19+
select HAVE_ASM_MODVERSIONS
20+
- select HAVE_BUILDTIME_MCOUNT_SORT
21+
select HAVE_CMPXCHG_DOUBLE
22+
select HAVE_CMPXCHG_LOCAL
23+
select HAVE_DEBUG_KMEMLEAK
24+
diff --git a/arch/s390/configs/debug_defconfig b/arch/s390/configs/debug_defconfig
25+
index 8b825e3578d8..b32a7915922c 100644
26+
--- a/arch/s390/configs/debug_defconfig
27+
+++ b/arch/s390/configs/debug_defconfig
28+
@@ -885,7 +885,6 @@ CONFIG_USER_EVENTS=y
29+
CONFIG_HIST_TRIGGERS=y
30+
CONFIG_FTRACE_STARTUP_TEST=y
31+
# CONFIG_EVENT_TRACE_STARTUP_TEST is not set
32+
-CONFIG_FTRACE_SORT_STARTUP_TEST=y
33+
CONFIG_SAMPLES=y
34+
CONFIG_SAMPLE_TRACE_PRINTK=m
35+
CONFIG_SAMPLE_FTRACE_DIRECT=m
36+
--
37+
2.49.0
38+

0 commit comments

Comments
 (0)