diff options
Diffstat (limited to 'include/asm-generic/vmlinux.lds.h')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 68649336c4ad..fe77e3395b40 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 |
| @@ -140,7 +141,8 @@ | |||
| 140 | #endif | 141 | #endif |
| 141 | 142 | ||
| 142 | #ifdef CONFIG_FTRACE_SYSCALLS | 143 | #ifdef CONFIG_FTRACE_SYSCALLS |
| 143 | #define TRACE_SYSCALLS() VMLINUX_SYMBOL(__start_syscalls_metadata) = .; \ | 144 | #define TRACE_SYSCALLS() . = ALIGN(8); \ |
| 145 | VMLINUX_SYMBOL(__start_syscalls_metadata) = .; \ | ||
| 144 | *(__syscalls_metadata) \ | 146 | *(__syscalls_metadata) \ |
| 145 | VMLINUX_SYMBOL(__stop_syscalls_metadata) = .; | 147 | VMLINUX_SYMBOL(__stop_syscalls_metadata) = .; |
| 146 | #else | 148 | #else |
| @@ -165,10 +167,8 @@ | |||
| 165 | CPU_KEEP(exit.data) \ | 167 | CPU_KEEP(exit.data) \ |
| 166 | MEM_KEEP(init.data) \ | 168 | MEM_KEEP(init.data) \ |
| 167 | MEM_KEEP(exit.data) \ | 169 | MEM_KEEP(exit.data) \ |
| 168 | . = ALIGN(32); \ | 170 | STRUCT_ALIGN(); \ |
| 169 | VMLINUX_SYMBOL(__start___tracepoints) = .; \ | ||
| 170 | *(__tracepoints) \ | 171 | *(__tracepoints) \ |
| 171 | VMLINUX_SYMBOL(__stop___tracepoints) = .; \ | ||
| 172 | /* implement dynamic printk debug */ \ | 172 | /* implement dynamic printk debug */ \ |
| 173 | . = ALIGN(8); \ | 173 | . = ALIGN(8); \ |
| 174 | VMLINUX_SYMBOL(__start___verbose) = .; \ | 174 | VMLINUX_SYMBOL(__start___verbose) = .; \ |
| @@ -176,13 +176,7 @@ | |||
| 176 | VMLINUX_SYMBOL(__stop___verbose) = .; \ | 176 | VMLINUX_SYMBOL(__stop___verbose) = .; \ |
| 177 | LIKELY_PROFILE() \ | 177 | LIKELY_PROFILE() \ |
| 178 | BRANCH_PROFILE() \ | 178 | BRANCH_PROFILE() \ |
| 179 | TRACE_PRINTKS() \ | 179 | TRACE_PRINTKS() |
| 180 | \ | ||
| 181 | STRUCT_ALIGN(); \ | ||
| 182 | FTRACE_EVENTS() \ | ||
| 183 | \ | ||
| 184 | STRUCT_ALIGN(); \ | ||
| 185 | TRACE_SYSCALLS() | ||
| 186 | 180 | ||
| 187 | /* | 181 | /* |
| 188 | * Data section helpers | 182 | * Data section helpers |
| @@ -220,6 +214,10 @@ | |||
| 220 | VMLINUX_SYMBOL(__start_rodata) = .; \ | 214 | VMLINUX_SYMBOL(__start_rodata) = .; \ |
| 221 | *(.rodata) *(.rodata.*) \ | 215 | *(.rodata) *(.rodata.*) \ |
| 222 | *(__vermagic) /* Kernel version magic */ \ | 216 | *(__vermagic) /* Kernel version magic */ \ |
| 217 | . = ALIGN(8); \ | ||
| 218 | VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \ | ||
| 219 | *(__tracepoints_ptrs) /* Tracepoints: pointer array */\ | ||
| 220 | VMLINUX_SYMBOL(__stop___tracepoints_ptrs) = .; \ | ||
| 223 | *(__markers_strings) /* Markers: strings */ \ | 221 | *(__markers_strings) /* Markers: strings */ \ |
| 224 | *(__tracepoints_strings)/* Tracepoints: strings */ \ | 222 | *(__tracepoints_strings)/* Tracepoints: strings */ \ |
| 225 | } \ | 223 | } \ |
| @@ -364,6 +362,13 @@ | |||
| 364 | VMLINUX_SYMBOL(__start___param) = .; \ | 362 | VMLINUX_SYMBOL(__start___param) = .; \ |
| 365 | *(__param) \ | 363 | *(__param) \ |
| 366 | VMLINUX_SYMBOL(__stop___param) = .; \ | 364 | VMLINUX_SYMBOL(__stop___param) = .; \ |
| 365 | } \ | ||
| 366 | \ | ||
| 367 | /* Built-in module versions. */ \ | ||
| 368 | __modver : AT(ADDR(__modver) - LOAD_OFFSET) { \ | ||
| 369 | VMLINUX_SYMBOL(__start___modver) = .; \ | ||
| 370 | *(__modver) \ | ||
| 371 | VMLINUX_SYMBOL(__stop___modver) = .; \ | ||
| 367 | . = ALIGN((align)); \ | 372 | . = ALIGN((align)); \ |
| 368 | VMLINUX_SYMBOL(__end_rodata) = .; \ | 373 | VMLINUX_SYMBOL(__end_rodata) = .; \ |
| 369 | } \ | 374 | } \ |
| @@ -475,6 +480,8 @@ | |||
| 475 | KERNEL_CTORS() \ | 480 | KERNEL_CTORS() \ |
| 476 | *(.init.rodata) \ | 481 | *(.init.rodata) \ |
| 477 | MCOUNT_REC() \ | 482 | MCOUNT_REC() \ |
| 483 | FTRACE_EVENTS() \ | ||
| 484 | TRACE_SYSCALLS() \ | ||
| 478 | DEV_DISCARD(init.rodata) \ | 485 | DEV_DISCARD(init.rodata) \ |
| 479 | CPU_DISCARD(init.rodata) \ | 486 | CPU_DISCARD(init.rodata) \ |
| 480 | MEM_DISCARD(init.rodata) \ | 487 | MEM_DISCARD(init.rodata) \ |