Merge branch 'linus' into tracing/ftrace

1 files changed, 1 insertions, 5 deletions

diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
index 288d587ce73c..6ec3b4f7719b 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -17,7 +17,7 @@ ENTRY(startup_xen)
 
         __FINIT
 
-.pushsection .bss.page_aligned
+.pushsection .text
         .align PAGE_SIZE_asm
 ENTRY(hypercall_page)
         .skip 0x1000
@@ -30,11 +30,7 @@ ENTRY(hypercall_page)
         ELFNOTE(Xen, XEN_ELFNOTE_ENTRY,          .long  startup_xen)
         ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long  hypercall_page)
         ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,       .asciz "!writable_page_tables|pae_pgdir_above_4gb")
-#ifdef CONFIG_X86_PAE
         ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE,       .asciz "yes")
-#else
-        ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE,       .asciz "no")
-#endif
         ELFNOTE(Xen, XEN_ELFNOTE_LOADER,         .asciz "generic")
 
 #endif /*CONFIG_XEN */