]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
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
include/asm-generic/vmlinux.lds.h
kernel/softirq.c

Simple merge
index 89997dfdf3d09f5147326912128ba882c57e39d8,89997dfdf3d09f5147326912128ba882c57e39d8,d656b462402431f0b7e4d94a5270883812a40f61,c61fab1dd2f82cbde0df850274a595d4c79aa450..0e0f39be6c8b668811c168ab28335108cd76c0dc
        *(__tracepoints)                                                \
        VMLINUX_SYMBOL(__stop___tracepoints) = .;                       \
        LIKELY_PROFILE()                                                \
   -    BRANCH_PROFILE()
   +    BRANCH_PROFILE()                                                \
++ +    TRACE_PRINTKS()                                                 \
   +    FTRACE_EVENTS()
    
    #define RO_DATA(align)                                                      \
        . = ALIGN((align));                                             \
Simple merge