---

yaml --- r: 264471 b: refs/heads/master c: bc74ee9 h: refs/heads/master i: 264469: ed75f1d 264467: 7c22ad8 264463: c83c7ea v: v3
git-mirror · Oct 24, 2011 · 140cdca · 140cdca
1 parent 6a726e9
commit 140cdca
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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
@@ -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 */	\
 	}								\
 									\