From 140cdca60d5ab8575cdd19fab8ace810a02971cb Mon Sep 17 00:00:00 2001 From: Kirill Tkhai Date: Sun, 4 Sep 2011 03:18:37 +0400 Subject: [PATCH] --- yaml --- r: 264471 b: refs/heads/master c: bc74ee976959616e3c1cc1341383bf2316dd4096 h: refs/heads/master i: 264469: ed75f1de932db56bb2b4075a2da5c35f7e42fd76 264467: 7c22ad8827838c4cf5d6986aea6920381bd225d5 264463: c83c7ea622b810c6fbd5b16f0f1d2f7b10bbba2f v: v3 --- [refs] | 2 +- trunk/arch/m68k/kernel/vmlinux.lds_no.S | 1 - trunk/include/asm-generic/vmlinux.lds.h | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 24f007bccfbd..930be96e033b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b223432f76acc13898b8874f55d5292da573d8e +refs/heads/master: bc74ee976959616e3c1cc1341383bf2316dd4096 diff --git a/trunk/arch/m68k/kernel/vmlinux.lds_no.S b/trunk/arch/m68k/kernel/vmlinux.lds_no.S index 7dc4087a9545..4e2389340837 100644 --- a/trunk/arch/m68k/kernel/vmlinux.lds_no.S +++ b/trunk/arch/m68k/kernel/vmlinux.lds_no.S @@ -77,7 +77,6 @@ SECTIONS { *(.rodata) *(.rodata.*) *(__vermagic) /* Kernel version magic */ - *(__markers_strings) *(.rodata1) *(.rodata.str1.1) diff --git a/trunk/include/asm-generic/vmlinux.lds.h b/trunk/include/asm-generic/vmlinux.lds.h index db22d136ad08..b5e2e4c6b017 100644 --- a/trunk/include/asm-generic/vmlinux.lds.h +++ b/trunk/include/asm-generic/vmlinux.lds.h @@ -222,7 +222,6 @@ VMLINUX_SYMBOL(__start___tracepoints_ptrs) = .; \ *(__tracepoints_ptrs) /* Tracepoints: pointer array */\ VMLINUX_SYMBOL(__stop___tracepoints_ptrs) = .; \ - *(__markers_strings) /* Markers: strings */ \ *(__tracepoints_strings)/* Tracepoints: strings */ \ } \ \