Skip to content

Commit c504b2f

Browse files
vittyvkjgross1
authored andcommitted
x86/xen: define startup_xen for XEN PV only
startup_xen references PV-only code, decorate it with #ifdef CONFIG_XEN_PV to make PV-free builds possible. Signed-off-by: Vitaly Kuznetsov <[email protected]> Reviewed-by: Juergen Gross <[email protected]> Signed-off-by: Juergen Gross <[email protected]>
1 parent 50a1062 commit c504b2f

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

arch/x86/xen/xen-head.S

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
#include <xen/interface/xen-mca.h>
1717
#include <asm/xen/interface.h>
1818

19+
#ifdef CONFIG_XEN_PV
1920
__INIT
2021
ENTRY(startup_xen)
2122
cld
@@ -34,6 +35,7 @@ ENTRY(startup_xen)
3435
jmp xen_start_kernel
3536

3637
__FINIT
38+
#endif
3739

3840
.pushsection .text
3941
.balign PAGE_SIZE
@@ -58,7 +60,9 @@ ENTRY(hypercall_page)
5860
/* Map the p2m table to a 512GB-aligned user address. */
5961
ELFNOTE(Xen, XEN_ELFNOTE_INIT_P2M, .quad PGDIR_SIZE)
6062
#endif
63+
#ifdef CONFIG_XEN_PV
6164
ELFNOTE(Xen, XEN_ELFNOTE_ENTRY, _ASM_PTR startup_xen)
65+
#endif
6266
ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page)
6367
ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,
6468
.ascii "!writable_page_tables|pae_pgdir_above_4gb")

0 commit comments

Comments
 (0)