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

[linux-2.6-omap-h63xx.git] / include / asm-generic / vmlinux.lds.h

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 89997dfdf3d09f5147326912128ba882c57e39d8..0e0f39be6c8b668811c168ab28335108cd76c0dc 100644 (file)
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -98,6 +98,7 @@
        VMLINUX_SYMBOL(__stop___tracepoints) = .;                       \
        LIKELY_PROFILE()                                                \
        BRANCH_PROFILE()                                                \
+       TRACE_PRINTKS()                                                 \
        FTRACE_EVENTS()
 
 #define RO_DATA(align)                                                 \
@@ -108,7 +109,6 @@
                *(__vermagic)           /* Kernel version magic */      \
                *(__markers_strings)    /* Markers: strings */          \
                *(__tracepoints_strings)/* Tracepoints: strings */      \
-               TRACE_PRINTKS()                                 \
        }                                                               \
                                                                        \
        .rodata1          : AT(ADDR(.rodata1) - LOAD_OFFSET) {          \