* [PATCH] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
@ 2009-11-18 20:40 Aristeu Rozanski
2009-11-19 3:03 ` Frederic Weisbecker
2009-11-19 3:24 ` Ingo Molnar
0 siblings, 2 replies; 4+ messages in thread
From: Aristeu Rozanski @ 2009-11-18 20:40 UTC (permalink / raw)
To: linux-kernel; +Cc: Frederic Weisbecker
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
2009-11-18 20:40 [PATCH] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390 Aristeu Rozanski
@ 2009-11-19 3:03 ` Frederic Weisbecker
2009-11-19 3:24 ` Ingo Molnar
1 sibling, 0 replies; 4+ messages in thread
From: Frederic Weisbecker @ 2009-11-19 3:03 UTC (permalink / raw)
To: Aristeu Rozanski, Ingo Molnar, Steven Rostedt, Martin Schwidefsky,
Heiko Carstens
Cc: linux-kernel
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 <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
>
Thanks!
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
We probably want this patch for .32
Not sure in which tree it best fits though, -tip or s390?
(Adding more people in Cc).
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
2009-11-18 20:40 [PATCH] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390 Aristeu Rozanski
2009-11-19 3:03 ` Frederic Weisbecker
@ 2009-11-19 3:24 ` Ingo Molnar
2009-11-19 11:44 ` Martin Schwidefsky
1 sibling, 1 reply; 4+ messages in thread
From: Ingo Molnar @ 2009-11-19 3:24 UTC (permalink / raw)
To: Aristeu Rozanski, Martin Schwidefsky, Heiko Carstens
Cc: linux-kernel, Frederic Weisbecker
* 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.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390
2009-11-19 3:24 ` Ingo Molnar
@ 2009-11-19 11:44 ` Martin Schwidefsky
0 siblings, 0 replies; 4+ messages in thread
From: Martin Schwidefsky @ 2009-11-19 11:44 UTC (permalink / raw)
To: Ingo Molnar
Cc: Aristeu Rozanski, Heiko Carstens, linux-kernel,
Frederic Weisbecker
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-11-19 11:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-11-18 20:40 [PATCH] ftrace: build ftrace.o when CONFIG_FTRACE_SYSCALLS is set for s390 Aristeu Rozanski
2009-11-19 3:03 ` Frederic Weisbecker
2009-11-19 3:24 ` Ingo Molnar
2009-11-19 11:44 ` Martin Schwidefsky
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox