diff options
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 6ebb81030d2d..f53708be95eb 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -124,7 +124,8 @@ | |||
| 124 | #endif | 124 | #endif |
| 125 | 125 | ||
| 126 | #ifdef CONFIG_EVENT_TRACING | 126 | #ifdef CONFIG_EVENT_TRACING |
| 127 | #define FTRACE_EVENTS() VMLINUX_SYMBOL(__start_ftrace_events) = .; \ | 127 | #define FTRACE_EVENTS() . = ALIGN(8); \ |
| 128 | VMLINUX_SYMBOL(__start_ftrace_events) = .; \ | ||
| 128 | *(_ftrace_events) \ | 129 | *(_ftrace_events) \ |
| 129 | VMLINUX_SYMBOL(__stop_ftrace_events) = .; | 130 | VMLINUX_SYMBOL(__stop_ftrace_events) = .; |
| 130 | #else | 131 | #else |
| @@ -179,9 +180,6 @@ | |||
| 179 | TRACE_PRINTKS() \ | 180 | TRACE_PRINTKS() \ |
| 180 | \ | 181 | \ |
| 181 | STRUCT_ALIGN(); \ | 182 | STRUCT_ALIGN(); \ |
| 182 | FTRACE_EVENTS() \ | ||
| 183 | \ | ||
| 184 | STRUCT_ALIGN(); \ | ||
| 185 | TRACE_SYSCALLS() | 183 | TRACE_SYSCALLS() |
| 186 | 184 | ||
| 187 | /* | 185 | /* |
| @@ -482,6 +480,7 @@ | |||
| 482 | KERNEL_CTORS() \ | 480 | KERNEL_CTORS() \ |
| 483 | *(.init.rodata) \ | 481 | *(.init.rodata) \ |
| 484 | MCOUNT_REC() \ | 482 | MCOUNT_REC() \ |
| 483 | FTRACE_EVENTS() \ | ||
| 485 | DEV_DISCARD(init.rodata) \ | 484 | DEV_DISCARD(init.rodata) \ |
| 486 | CPU_DISCARD(init.rodata) \ | 485 | CPU_DISCARD(init.rodata) \ |
| 487 | MEM_DISCARD(init.rodata) \ | 486 | MEM_DISCARD(init.rodata) \ |