lkml.org 
[lkml]   [2009]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
On Thu, 19 Nov 2009 04:24:39 +0100
Ingo Molnar <mingo@elte.hu> wrote:

>
> * Aristeu Rozanski <aris@redhat.com> 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 <aris@redhat.com>
> >
> > ---
> > 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.



\
 
 \ /
  Last update: 2009-11-19 12:47    [W:0.043 / U:0.068 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site