2009-11-18 20:39:59

by Aristeu Rozanski

Subject: [PATCH] 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.

Signed-off-by: Aristeu Rozanski <[email protected]>

---
arch/s390/kernel/Makefile | 1 +
1 file changed, 1 insertion(+)

--- linus-2.6.orig/arch/s390/kernel/Makefile 2009-10-30 17:49:10.000000000 -0400
+++ linus-2.6/arch/s390/kernel/Makefile 2009-11-18 15:39:52.000000000 -0500
@@ -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

2009-11-19 03:02:59

by Frederic Weisbecker

Subject: Re: [PATCH] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390

On Wed, Nov 18, 2009 at 03:40:44PM -0500, Aristeu Rozanski wrote:
> Trying to build a s390x kernel with CONFIG_FTRACE_SYSCALLS will 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(+)
>
> --- linus-2.6.orig/arch/s390/kernel/Makefile 2009-10-30 17:49:10.000000000 -0400
> +++ linus-2.6/arch/s390/kernel/Makefile 2009-11-18 15:39:52.000000000 -0500
> @@ -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!

Acked-by: Frederic Weisbecker <[email protected]>

We probably want this patch for .32
Not sure in which tree it best fits though, -tip or s390?
(Adding more people in Cc).

2009-11-19 03:24:43

by Ingo Molnar

Subject: Re: [PATCH] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390

* Aristeu Rozanski <[email protected]> wrote:

> Trying to build a s390x kernel with CONFIG_FTRACE_SYSCALLS will 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(+)
>
> --- linus-2.6.orig/arch/s390/kernel/Makefile 2009-10-30 17:49:10.000000000 -0400
> +++ linus-2.6/arch/s390/kernel/Makefile 2009-11-18 15:39:52.000000000 -0500
> @@ -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

2009-11-19 11:44:12

by Martin Schwidefsky

Subject: Re: [PATCH] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390

On Thu, 19 Nov 2009 04:24:39 +0100
Ingo Molnar <[email protected]> wrote:

>
> * Aristeu Rozanski <[email protected]> wrote:
>
> > Trying to build a s390x kernel with CONFIG_FTRACE_SYSCALLS will 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(+)
> >
> > --- linus-2.6.orig/arch/s390/kernel/Makefile 2009-10-30 17:49:10.000000000 -0400
> > +++ linus-2.6/arch/s390/kernel/Makefile 2009-11-18 15:39:52.000000000 -0500
> > @@ -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.

Yes, I will add that to the s390 tree for the next merge window.
Thanks.

--
blue skies,
Martin.

"Reality continues to ruin my life." - Calvin.