Revert 1096:0fc6424770c8

diff --git a/arch/i386/kernel/head-xen.S b/arch/i386/kernel/head-xen.S
index a35fb0baf5804ffbfc6bd2b5f2c23783dfaa2813..b96ff493c79dfb2ef6773424b7470f977cea5351 100644 (file)
--- a/arch/i386/kernel/head-xen.S
+++ b/arch/i386/kernel/head-xen.S
@@ -142,12 +142,6 @@ ENTRY(cpu_gdt_table)
        .quad 0x0000000000000000        /* 0xf0 - unused */
        .quad 0x0000000000000000        /* 0xf8 - GDT entry 31: double-fault TSS */
 
-#ifdef CONFIG_XEN_UNPRIVILEGED_GUEST
-# define XEN_PRIV_CAP "!unprivileged"
-#else
-# define XEN_PRIV_CAP "privileged|unprivileged"
-#endif
-
 #if CONFIG_XEN_COMPAT <= 0x030002
 /*
  * __xen_guest information
@@ -174,8 +168,7 @@ ENTRY(cpu_gdt_table)
                utoa (__PAGE_OFFSET + __PHYSICAL_START + VIRT_ENTRY_OFFSET)
        .ascii  ",HYPERCALL_PAGE=0x"
                utoa ((__PHYSICAL_START+HYPERCALL_PAGE_OFFSET)>>PAGE_SHIFT)
-       .ascii  ",FEATURES=" XEN_PRIV_CAP
-       .ascii           "|writable_page_tables"
+       .ascii  ",FEATURES=writable_page_tables"
        .ascii           "|writable_descriptor_tables"
        .ascii           "|auto_translated_physmap"
        .ascii           "|pae_pgdir_above_4gb"
@@ -202,12 +195,7 @@ ENTRY(cpu_gdt_table)
        ELFNOTE(Xen, XEN_ELFNOTE_ENTRY,          .long,  startup_32)
        ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .long,  hypercall_page)
        ELFNOTE(Xen, XEN_ELFNOTE_HV_START_LOW,   .long,  HYPERVISOR_VIRT_START)
-       ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,       .ascii, XEN_PRIV_CAP;
-                                                .ascii  "|writable_page_tables";
-                                                .ascii  "|writable_descriptor_tables";
-                                                .ascii  "|auto_translated_physmap";
-                                                .ascii  "|pae_pgdir_above_4gb";
-                                                .asciz  "|supervisor_mode_kernel")
+       ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,       .asciz, "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel")
 #ifdef CONFIG_X86_PAE
        ELFNOTE(Xen, XEN_ELFNOTE_PAE_MODE,       .asciz, "yes")
        ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID,   .quad,  _PAGE_PRESENT,_PAGE_PRESENT)

diff --git a/arch/x86_64/kernel/head-xen.S b/arch/x86_64/kernel/head-xen.S
index 01a4ba6efafc42647dc342424ad2fdc7a2b08097..6981e4eac7da9d41f9487acddc732ee14e1d1560 100644 (file)
--- a/arch/x86_64/kernel/head-xen.S
+++ b/arch/x86_64/kernel/head-xen.S
@@ -160,12 +160,6 @@ gdt_end:
 ENTRY(empty_zero_page)
        .skip PAGE_SIZE
 
-#ifdef CONFIG_XEN_UNPRIVILEGED_GUEST
-# define XEN_PRIV_CAP "!unprivileged"
-#else
-# define XEN_PRIV_CAP "privileged|unprivileged"
-#endif
-
 #if CONFIG_XEN_COMPAT <= 0x030002
 /*
  * __xen_guest information
@@ -192,8 +186,7 @@ ENTRY(empty_zero_page)
                utoh (__START_KERNEL_map + __PHYSICAL_START)
        .ascii  ",HYPERCALL_PAGE=0x"
                utoh (phys_hypercall_page >> PAGE_SHIFT)
-       .ascii  ",FEATURES=" XEN_PRIV_CAP
-       .ascii           "|writable_page_tables"
+       .ascii  ",FEATURES=writable_page_tables"
        .ascii           "|writable_descriptor_tables"
        .ascii           "|auto_translated_physmap"
        .ascii           "|supervisor_mode_kernel"
@@ -213,10 +206,6 @@ ENTRY(empty_zero_page)
        ELFNOTE(Xen, XEN_ELFNOTE_ENTRY,          .quad,  startup_64)
        ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, .quad,  hypercall_page)
        ELFNOTE(Xen, XEN_ELFNOTE_L1_MFN_VALID,   .quad,  _PAGE_PRESENT,_PAGE_PRESENT)
-       ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,       .ascii, XEN_PRIV_CAP;
-                                                .ascii "|writable_page_tables";
-                                                .ascii "|writable_descriptor_tables";
-                                                .ascii "|auto_translated_physmap";
-                                                .asciz "|supervisor_mode_kernel")
+       ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,       .asciz, "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|supervisor_mode_kernel")
        ELFNOTE(Xen, XEN_ELFNOTE_LOADER,         .asciz, "generic")
        ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long,  1)