x86/brk: put the brk reservations in their own section

Impact: disambiguate real .bss variables from .brk storage

Add a .brk section after the .bss section.  This has no effect
on the final vmlinux, but it more clearly distinguishes the space
taken by actual .bss symbols, and the variable space reserved
by .brk users.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>

2 files changed, 8 insertions, 4 deletions

diff --git a/arch/x86/kernel/vmlinux_32.lds.S b/arch/x86/kernel/vmlinux_32.lds.S
index 98424f33e077..de14973e47fd 100644
--- a/arch/x86/kernel/vmlinux_32.lds.S
+++ b/arch/x86/kernel/vmlinux_32.lds.S
@@ -189,16 +189,18 @@ SECTIONS
         *(.bss)
         . = ALIGN(4);
         __bss_stop = .;
+  }
 
+  .brk : AT(ADDR(.brk) - LOAD_OFFSET) {
         . = ALIGN(PAGE_SIZE);
         __brk_base = . ;
-        . += 64 * 1024 ;        /* 64k slop space */
+        . += 64 * 1024 ;        /* 64k alignment slop space */
         *(.brk_reservation)     /* areas brk users have reserved */
         __brk_limit = . ;
-
-        _end = . ;
   }
 
+  _end = . ;
+
   /* Sections to be discarded */
   /DISCARD/ : {
         *(.exitcall.exit)
diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S
index 7996687663a2..c8742507b030 100644
--- a/arch/x86/kernel/vmlinux_64.lds.S
+++ b/arch/x86/kernel/vmlinux_64.lds.S
@@ -247,10 +247,12 @@ SECTIONS
         *(.bss.page_aligned)
         *(.bss)
         __bss_stop = .;
+  }
 
+  .brk : AT(ADDR(.brk) - LOAD_OFFSET) {
         . = ALIGN(PAGE_SIZE);
         __brk_base = . ;
-        . += 64 * 1024;         /* 64k slop space */
+        . += 64 * 1024 ;        /* 64k alignment slop space */
         *(.brk_reservation)     /* areas brk users have reserved */
         __brk_limit = . ;
   }