Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1600750

[PATCH v3 16/21] x86/xen: define startup_xen for XEN PV only

Show all headers | View raw

startup_xen references PV-only code, decorate it with #ifdef CONFIG_XEN_PV
to make PV-free builds possible.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
---
 arch/x86/xen/xen-head.S | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/x86/xen/xen-head.S b/arch/x86/xen/xen-head.S
index 37794e4..72a8e6a 100644
--- a/arch/x86/xen/xen-head.S
+++ b/arch/x86/xen/xen-head.S
@@ -16,6 +16,7 @@
 #include <xen/interface/xen-mca.h>
 #include <asm/xen/interface.h>
 
+#ifdef CONFIG_XEN_PV
 	__INIT
 ENTRY(startup_xen)
 	cld
@@ -34,6 +35,7 @@ ENTRY(startup_xen)
 	jmp xen_start_kernel
 
 	__FINIT
+#endif
 
 .pushsection .text
 	.balign PAGE_SIZE
@@ -58,7 +60,9 @@ ENTRY(hypercall_page)
 	/* Map the p2m table to a 512GB-aligned user address. */
 	ELFNOTE(Xen, XEN_ELFNOTE_INIT_P2M,       .quad PGDIR_SIZE)
 #endif
+#ifdef CONFIG_XEN_PV
 	ELFNOTE(Xen, XEN_ELFNOTE_ENTRY,          _ASM_PTR startup_xen)
+#endif
 	ELFNOTE(Xen, XEN_ELFNOTE_HYPERCALL_PAGE, _ASM_PTR hypercall_page)
 	ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,
 		.ascii "!writable_page_tables|pae_pgdir_above_4gb")
-- 
2.9.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 00/21] x86/xen: untangle PV and PVHVM guest support code Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 03/21] x86/xen: add CONFIG_XEN_PV to Kconfig Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
    Re: [PATCH v3 03/21] x86/xen: add CONFIG_XEN_PV to Kconfig Juergen Gross <jgross@suse.com> - 2017-03-15 10:40 +0100
  [PATCH v3 18/21] xen/balloon: decorate PV-only parts with #ifdef CONFIG_XEN_PV Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 20/21] x86/xen: enable PVHVM-only builds Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 17/21] x86/xen: create stubs for HVM-only builds in page.h Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 16/21] x86/xen: define startup_xen for XEN PV only Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 14/21] x86/xen: split suspend.c for PV and PVHVM guests Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 09/21] x86/xen: split xen_cpu_die() Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 19/21] xen: create xen_create/destroy_contiguous_region() stubs for PVHVM only builds Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 04/21] x86/xen: split off enlighten_pvh.c Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 01/21] x86/xen: separate PV and HVM hypervisors Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
    Re: [PATCH v3 01/21] x86/xen: separate PV and HVM hypervisors Juergen Gross <jgross@suse.com> - 2017-03-15 10:50 +0100
  [PATCH v3 07/21] x86/xen: split xen_smp_intr_init()/xen_smp_intr_free() Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 12/21] x86/xen: split off mmu_hvm.c Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 21/21] x86/xen: rename some PV-only functions in smp_pv.c Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 11/21] x86/xen: split off smp_pv.c Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:40 +0100
  [PATCH v3 08/21] x86/xen: split xen_smp_prepare_boot_cpu() Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:50 +0100
  [PATCH v3 02/21] x86/xen: globalize have_vcpu_info_placement Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:50 +0100
  [PATCH v3 10/21] x86/xen: split off smp_hvm.c Vitaly Kuznetsov <vkuznets@redhat.com> - 2017-03-14 18:50 +0100
  Re: [PATCH v3 00/21] x86/xen: untangle PV and PVHVM guest support  code Juergen Gross <jgross@suse.com> - 2017-03-15 10:50 +0100
    Re: [PATCH v3 00/21] x86/xen: untangle PV and PVHVM guest support  code Boris Ostrovsky <boris.ostrovsky@oracle.com> - 2017-03-15 18:00 +0100

csiph-web