Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

1 files changed, 1 insertions, 4 deletions

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 030a954ed292..8a92a170fb7d 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -156,10 +156,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)                                                \
@@ -653,6 +649,7 @@
         EXIT_DATA                                                       \
         EXIT_CALL                                                       \
         *(.discard)                                                     \
+        *(.discard.*)                                                   \
         }
 
 /**