1 files changed, 18 insertions, 3 deletions

diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
index 0d860963f268..62ad500d55f3 100644
--- a/arch/x86/kernel/vmlinux_32.lds.S
+++ b/arch/x86/kernel/vmlinux_32.lds.S
@@ -189,15 +189,24 @@ SECTIONS
         *(.bss)
         . = ALIGN(4);
         __bss_stop = .;
-        _end = . ;
-        /* This is where the kernel creates the early boot page tables */
+  }
+
+  .brk : AT(ADDR(.brk) - LOAD_OFFSET) {
         . = ALIGN(PAGE_SIZE);
-        pg0 = . ;
+        __brk_base = . ;
+        . += 64 * 1024 ;        /* 64k alignment slop space */
+        *(.brk_reservation)     /* areas brk users have reserved */
+        __brk_limit = . ;
+  }
+
+  .end : AT(ADDR(.end) - LOAD_OFFSET) {
+        _end = . ;
   }
 
   /* Sections to be discarded */
   /DISCARD/ : {
         *(.exitcall.exit)
+        *(.discard)
         }
 
   STABS_DEBUG
@@ -205,6 +214,12 @@ SECTIONS
   DWARF_DEBUG
 }
 
+/*
+ * Build-time check on the image size:
+ */
+ASSERT((_end - LOAD_OFFSET <= KERNEL_IMAGE_SIZE),
+        "kernel image bigger than KERNEL_IMAGE_SIZE")
+
 #ifdef CONFIG_KEXEC
 /* Link time checks */
 #include <asm/kexec.h>