2 files changed, 8 insertions, 4 deletions

diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S
index 4dc44b8007cc..7d72cce00529 100644
--- a/arch/i386/kernel/vmlinux.lds.S
+++ b/arch/i386/kernel/vmlinux.lds.S
@@ -60,7 +60,9 @@ SECTIONS
         __stop___ex_table = .;
   }
 
-  BUG_TABLE
+  NOTES :text :note
+
+  BUG_TABLE :text
 
   . = ALIGN(4);
   .tracedata : AT(ADDR(.tracedata) - LOAD_OFFSET) {
@@ -208,6 +210,4 @@ SECTIONS
   STABS_DEBUG
 
   DWARF_DEBUG
-
-  NOTES
 }
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index a2b09ed852ad..0240e0506a07 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -224,7 +224,11 @@
         }
 
 #define NOTES                                                           \
-        .notes : { *(.note.*) } :note
+        .notes : AT(ADDR(.notes) - LOAD_OFFSET) {                       \
+                VMLINUX_SYMBOL(__start_notes) = .;                      \
+                *(.note.*)                                              \
+                VMLINUX_SYMBOL(__stop_notes) = .;                       \
+        }
 
 #define INITCALLS                                                       \
         *(.initcall0.init)                                              \