* linux-next: manual merge of the ftrace tree with the x86 tree
@ 2009-02-17 0:42 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2009-02-17 0:42 UTC (permalink / raw)
To: Thomas Gleixner, Ingo Molnar, H. Peter Anvin; +Cc: linux-next, Steven Rostedt
Hi all,
Today's linux-next merge of the ftrace tree got a conflict in
arch/x86/Kconfig between commits e0ec9483dbe8f534e0f3ef413f9eba9a5ff78050
("x86/Voyager: remove KVM Kconfig quirk") and
49793b0341a802cf5ee4179e837a2eb20f12c9fe ("x86/Voyager: remove KGDB
Kconfig quirk") from the x86 tree and commit
9a5fd902273d01170fd033691bd70b142baa7309 ("ftrace: change function graph
tracer to use new in_nmi") from the ftrace tree.
Just context changes. I fixed it up as in tip/master (see below) and can
carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/Kconfig
index 1042d69,8fc9a84..0000000
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -34,8 -34,9 +34,9 @@@ config X8
select HAVE_FUNCTION_TRACER
select HAVE_FUNCTION_GRAPH_TRACER
select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+ select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
- select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64)
- select HAVE_ARCH_KGDB if !X86_VOYAGER
+ select HAVE_KVM
+ select HAVE_ARCH_KGDB
select HAVE_ARCH_TRACEHOOK
select HAVE_GENERIC_DMA_COHERENT if X86_32
select HAVE_EFFICIENT_UNALIGNED_ACCESS
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2009-02-17 0:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-02-17 0:42 linux-next: manual merge of the ftrace tree with the x86 tree Stephen Rothwell
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.