ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
PATCH 1/1 ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
Trying to build a s390x kernel with CONFIG_FTRACE_SYSCALLS will fail because ftrace.o is not built/linked.
--- arch/s390/kernel/Makefile | 1 + 1 file changed, 1 insertion(+)
arch/s390/kernel/Makefile +1 -0
@@ -44,6 +44,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_FUNCTION_TRACER) += $(if $(CONFIG_64BIT),mcount64.o,mcount.o) obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o +obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o # Kexec part S390_KEXEC_OBJS := machine_kexec.o crash.o
Quoted 13 lines · Aristeu Rozanski
Trying to build a s390x kernel with
CONFIG_FTRACE_SYSCALLSwill fail because ftrace.o is not built/linked.Signed-off-by Aristeu Rozanski <[email protected]>--- arch/s390/kernel/Makefile | 1 + 1 file changed, 1 insertion(+)
arch/s390/kernel/Makefile obj-$(CONFIG_KPROBES) += kprobes.o · line 50
Quoted 7 lines
arch/s390/kernel/Makefile +1
-0@@ -44,6 +44,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_FUNCTION_TRACER) += $(if $(CONFIG_64BIT),mcount64.o,mcount.o) obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o +obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o # Kexec part S390_KEXEC_OBJS := machine_kexec.o crash.o
Thanks!
We probably want this patch for .32
Not sure in which tree it best fits though, -tip or s390? (Adding more people in Cc).
Quoted 12 lines · Aristeu Rozanski
Trying to build a s390x kernel with
CONFIG_FTRACE_SYSCALLSwill fail because ftrace.o is not built/linked.Signed-off-by Aristeu Rozanski <[email protected]>--- arch/s390/kernel/Makefile | 1 + 1 file changed, 1 insertion(+)
arch/s390/kernel/Makefile obj-$(CONFIG_KPROBES) += kprobes.o · line 50
Quoted 7 lines
arch/s390/kernel/Makefile +1
-0@@ -44,6 +44,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_FUNCTION_TRACER) += $(if $(CONFIG_64BIT),mcount64.o,mcount.o) obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o +obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o # Kexec part S390_KEXEC_OBJS := machine_kexec.o crash.o
Nice catch. AFAICS the build failure should trigger if DYNAMIC_FTRACE and FUNCTION_GRAPH_TRACER is disabled - and i think it affects current mainline too.
I've Cc:-ed Martin and Heiko - i think this fix is for the s390 tree.
Thanks,
Ingo
Quoted 20 lines · On Thu, 19 Nov 2009 04:24:39 +0100 Ingo Molnar <[email protected]> wrote:
Quoted 17 lines · Aristeu Rozanski
Trying to build a s390x kernel with
CONFIG_FTRACE_SYSCALLSwill fail because ftrace.o is not built/linked.Signed-off-by Aristeu Rozanski <[email protected]>--- arch/s390/kernel/Makefile | 1 + 1 file changed, 1 insertion(+)arch/s390/kernel/Makefile +1
-0@@ -44,6 +44,7 @@ obj-$(CONFIG_KPROBES) += kprobes.o obj-$(CONFIG_FUNCTION_TRACER) += $(if $(CONFIG_64BIT),mcount64.o,mcount.o) obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o +obj-$(CONFIG_FTRACE_SYSCALLS) += ftrace.o
Quoted 8 lines
arch/s390/kernel/Makefile obj-$(CONFIG_KPROBES) += kprobes.o · line 50
Quoted 2 lines
arch/s390/kernel/Makefile +0
-0# Kexec part S390_KEXEC_OBJS := machine_kexec.o crash.oNice catch. AFAICS the build failure should trigger if
DYNAMIC_FTRACEandFUNCTION_GRAPH_TRACERis disabled - and i think it affects current mainline too.I've Cc:-ed Martin and Heiko - i think this fix is for the s390 tree.
Yes, I will add that to the s390 tree for the next merge window. Thanks.
Signature · 4 lines
blue skies, Martin. "Reality continues to ruin my life." - Calvin.