diff options
| author | David S. Miller <davem@davemloft.net> | 2009-03-27 20:19:16 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-03-27 20:19:16 -0400 |
| commit | a83398570e17af6bb81eb94f4f5dd356bd2828d8 (patch) | |
| tree | 5b5c7c3a56898485479291b7c964a1f3887d469c /include/asm-generic/vmlinux.lds.h | |
| parent | f9384d41c02408dd404aa64d66d0ef38adcf6479 (diff) | |
| parent | 0b4d569de222452bcb55a4a536ade6cf4d8d1e30 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'include/asm-generic/vmlinux.lds.h')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index c61fab1dd2f8..aca40b93bd28 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -80,6 +80,11 @@ | |||
| 80 | VMLINUX_SYMBOL(__start___tracepoints) = .; \ | 80 | VMLINUX_SYMBOL(__start___tracepoints) = .; \ |
| 81 | *(__tracepoints) \ | 81 | *(__tracepoints) \ |
| 82 | VMLINUX_SYMBOL(__stop___tracepoints) = .; \ | 82 | VMLINUX_SYMBOL(__stop___tracepoints) = .; \ |
| 83 | /* implement dynamic printk debug */ \ | ||
| 84 | . = ALIGN(8); \ | ||
| 85 | VMLINUX_SYMBOL(__start___verbose) = .; \ | ||
| 86 | *(__verbose) \ | ||
| 87 | VMLINUX_SYMBOL(__stop___verbose) = .; \ | ||
| 83 | LIKELY_PROFILE() \ | 88 | LIKELY_PROFILE() \ |
| 84 | BRANCH_PROFILE() | 89 | BRANCH_PROFILE() |
| 85 | 90 | ||
| @@ -309,15 +314,7 @@ | |||
| 309 | CPU_DISCARD(init.data) \ | 314 | CPU_DISCARD(init.data) \ |
| 310 | CPU_DISCARD(init.rodata) \ | 315 | CPU_DISCARD(init.rodata) \ |
| 311 | MEM_DISCARD(init.data) \ | 316 | MEM_DISCARD(init.data) \ |
| 312 | MEM_DISCARD(init.rodata) \ | 317 | MEM_DISCARD(init.rodata) |
| 313 | /* implement dynamic printk debug */ \ | ||
| 314 | VMLINUX_SYMBOL(__start___verbose_strings) = .; \ | ||
| 315 | *(__verbose_strings) \ | ||
| 316 | VMLINUX_SYMBOL(__stop___verbose_strings) = .; \ | ||
| 317 | . = ALIGN(8); \ | ||
| 318 | VMLINUX_SYMBOL(__start___verbose) = .; \ | ||
| 319 | *(__verbose) \ | ||
| 320 | VMLINUX_SYMBOL(__stop___verbose) = .; | ||
| 321 | 318 | ||
| 322 | #define INIT_TEXT \ | 319 | #define INIT_TEXT \ |
| 323 | *(.init.text) \ | 320 | *(.init.text) \ |