1 files changed, 5 insertions, 3 deletions

diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
index da6b35a98260..49edf2dd3613 100644
--- a/arch/x86/kernel/vmlinux.lds.S
+++ b/arch/x86/kernel/vmlinux.lds.S
@@ -147,7 +147,6 @@ SECTIONS
                 _edata = .;
         } :data
 
-#ifdef CONFIG_X86_64
 
         . = ALIGN(PAGE_SIZE);
         __vvar_page = .;
@@ -165,12 +164,15 @@ SECTIONS
 #undef __VVAR_KERNEL_LDS
 #undef EMIT_VVAR
 
+                /*
+                 * Pad the rest of the page with zeros.  Otherwise the loader
+                 * can leave garbage here.
+                 */
+                . = __vvar_beginning_hack + PAGE_SIZE;
         } :data
 
        . = ALIGN(__vvar_page + PAGE_SIZE, PAGE_SIZE);
 
-#endif /* CONFIG_X86_64 */
-
         /* Init code and data - will be freed after init */
         . = ALIGN(PAGE_SIZE);
         .init.begin : AT(ADDR(.init.begin) - LOAD_OFFSET) {