From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 10 Mar 2009 08:56:25 +0000 (+0100)
Subject: Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'linus' into... 
X-Git-Tag: v2.6.30-rc1~2^2~53
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=12e87e36e0141c08dbc8b2177c93c75fb18ad7e5;p=linux.git

Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'linus' into tracing/core
---

12e87e36e0141c08dbc8b2177c93c75fb18ad7e5
diff --cc include/asm-generic/vmlinux.lds.h
index 89997dfdf3d0,89997dfdf3d0,d656b4624024,c61fab1dd2f8..0e0f39be6c8b
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@@@@ -97,8 -97,8 -97,9 -81,7 +97,9 @@@@@
    	*(__tracepoints)						\
    	VMLINUX_SYMBOL(__stop___tracepoints) = .;			\
    	LIKELY_PROFILE()		       				\
   -	BRANCH_PROFILE()
   +	BRANCH_PROFILE()						\
++ +	TRACE_PRINTKS()							\
   +	FTRACE_EVENTS()
    
    #define RO_DATA(align)							\
    	. = ALIGN((align));						\