kernel-ark/arch
Stephen Rothwell a095bdbb13 tracing, powerpc: fix powerpc tree and tracing tree interaction
Today's linux-next build (powerpc allyesconfig) failed like this:

arch/powerpc/kernel/ftrace.c: In function 'prepare_ftrace_return':
arch/powerpc/kernel/ftrace.c:612: warning: passing argument 3 of 'ftrace_push_return_trace' makes pointer from integer without a cast
arch/powerpc/kernel/ftrace.c:612: error: too many arguments to function 'ftrace_push_return_trace'

Caused by commit 5d1a03dc54
("function-graph: moved the timestamp from arch to generic code") from
the tracing tree which (removed an argument from
ftrace_push_return_trace()) interacting with commit
6794c78243 ("powerpc64: port of the
function graph tracer") from the powerpc tree.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Steven Rostedt <srostedt@redhat.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: <linuxppc-dev@ozlabs.org>
LKML-Reference: <20090327230834.93d0221d.sfr@canb.auug.org.au>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
2009-04-02 00:50:24 +02:00
..
alpha Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
arm V4L/DVB (11034): soc-camera: remove now unused gpio member of struct soc_camera_link 2009-03-30 12:43:22 -03:00
avr32 Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
blackfin Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
cris Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
frv cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
h8300 Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
ia64 Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
m32r cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
m68k Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
m68knommu Merge branch 'master' of /home/davem/src/GIT/linux-2.6/ 2009-03-26 15:23:24 -07:00
mips Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
mn10300 cpumask: remove references to struct irqaction's mask field. 2009-03-30 22:05:14 +10:30
parisc Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
powerpc tracing, powerpc: fix powerpc tree and tracing tree interaction 2009-04-02 00:50:24 +02:00
s390 Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 2009-04-01 09:22:24 -07:00
sh Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask 2009-03-30 18:00:26 -07:00
sparc mm: use debug_kmap_atomic 2009-04-01 08:59:14 -07:00
um Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
x86 Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
xtensa Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00
.gitignore
Kconfig Merge branch 'tracing/core-v2' into tracing-for-linus 2009-04-02 00:49:02 +02:00