projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42b40b3 c3ffc7a 7bffc23 7a203f3)
Merge branches 'tracing/doc', 'tracing/ftrace', 'tracing/printk' and 'linus' into...
authorIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 08:56:25 +0000 (09:56 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 10 Mar 2009 08:56:25 +0000 (09:56 +0100)
1  2  3  4 
arch/blackfin/kernel/irqchip.c patch | diff1 | diff2 | diff3 | diff4 | blob | history
include/asm-generic/vmlinux.lds.h patch | diff1 | diff2 | diff3 | diff4 | blob | history
kernel/softirq.c patch | diff1 | diff2 | diff3 | diff4 | blob | history

diff --cc arch/blackfin/kernel/irqchip.c
Simple merge
diff --cc include/asm-generic/vmlinux.lds.h
index 89997dfdf3d09f5147326912128ba882c57e39d8,89997dfdf3d09f5147326912128ba882c57e39d8,d656b462402431f0b7e4d94a5270883812a40f61,c61fab1dd2f82cbde0df850274a595d4c79aa450..0e0f39be6c8b668811c168ab28335108cd76c0dc
--- 1/include/asm-generic/vmlinux.lds.h
--- 2/include/asm-generic/vmlinux.lds.h
--- 3/include/asm-generic/vmlinux.lds.h
--- 4/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));                                             \
diff --cc kernel/softirq.c
Simple merge