linux: rebase patches for 6.14-rc1

This commit is contained in:
Rudi Heitbaum
2025-02-05 08:57:32 +00:00
parent 8fc5cd6f9e
commit df82dd93b7

View File

@@ -1,13 +1,13 @@
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 0294bfb6c5f8..153036bbed7e 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -35,7 +35,7 @@ ifeq ($(SRCARCH),x86)
ifeq (${IS_64_BIT}, 1)
CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT -DHAVE_SYSCALL_TABLE -I$(OUTPUT)arch/x86/include/generated
--- a/tools/perf/Makefile.config 2025-02-02 23:39:26.000000000 +0000
+++ b/tools/perf/Makefile.config 2025-02-05 08:55:31.002570025 +0000
@@ -44,7 +44,7 @@
CFLAGS += -DHAVE_ARCH_X86_64_SUPPORT
ARCH_INCLUDE = ../../arch/x86/lib/memcpy_64.S ../../arch/x86/lib/memset_64.S
- LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind -llzma
+ LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind
ifndef NO_LIBUNWIND
- LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind -llzma
+ LIBUNWIND_LIBS = -lunwind-x86_64 -lunwind
endif
$(call detected,CONFIG_X86_64)
else
LIBUNWIND_LIBS = -lunwind-x86 -llzma -lunwind