diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-22 09:08:14 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-22 09:08:14 +0200 |
| commit | debfcaf93ed500a051489db6646d71f29fe86a68 (patch) | |
| tree | 7ba189b6dd654022ecc655b68e3c0a4573627706 /arch/x86/xen | |
| parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
| parent | 81520a1b0649d0701205b818714a8c1e1cfbbb5b (diff) | |
| download | linux-3.10-debfcaf93ed500a051489db6646d71f29fe86a68.tar.gz linux-3.10-debfcaf93ed500a051489db6646d71f29fe86a68.tar.bz2 linux-3.10-debfcaf93ed500a051489db6646d71f29fe86a68.zip | |
Merge branch 'tracing/ftrace' into tracing/urgent
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 313947940a1..6dcefba7836 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile @@ -1,4 +1,4 @@ -ifdef CONFIG_FTRACE +ifdef CONFIG_FUNCTION_TRACER # Do not profile debug and lowlevel utilities CFLAGS_REMOVE_spinlock.o = -pg CFLAGS_REMOVE_time.o = -pg |