diff options
author | Ingo Molnar <mingo@elte.hu> | 2010-07-17 12:00:25 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2010-07-17 12:00:25 +0200 |
commit | 31a05a4127c81d5d7f095c609420bf6df892a8b0 (patch) | |
tree | ebc68a2329703b9e0ba8d1e6ba22c9730c74223c /include | |
parent | 8217563359878d11ef03cc76bc935ada89d73efd (diff) | |
parent | eb878b3bc0349344dbf70c51bf01fc734d5cf2d3 (diff) | |
download | talos-op-linux-31a05a4127c81d5d7f095c609420bf6df892a8b0.tar.gz talos-op-linux-31a05a4127c81d5d7f095c609420bf6df892a8b0.zip |
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/random-tracing into perf/core
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/vmlinux.lds.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 48c5299cbf26..415b1a9118e7 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -150,10 +150,6 @@ CPU_KEEP(exit.data) \ MEM_KEEP(init.data) \ MEM_KEEP(exit.data) \ - . = ALIGN(8); \ - VMLINUX_SYMBOL(__start___markers) = .; \ - *(__markers) \ - VMLINUX_SYMBOL(__stop___markers) = .; \ . = ALIGN(32); \ VMLINUX_SYMBOL(__start___tracepoints) = .; \ *(__tracepoints) \ |