Pārlūkot izejas kodu

x86/xen: enable PVHVM-only builds

Now everything is in place and we can move PV-only code under
CONFIG_XEN_PV. CONFIG_XEN_PV_SMP is created to support the change.

Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Juergen Gross <jgross@suse.com>
Vitaly Kuznetsov 8 gadi atpakaļ
vecāks
revīzija
33af746985
2 mainītis faili ar 9 papildinājumiem un 4 dzēšanām
  1. 4 0
      arch/x86/xen/Kconfig
  2. 5 4
      arch/x86/xen/Makefile

+ 4 - 0
arch/x86/xen/Kconfig

@@ -22,6 +22,10 @@ config XEN_PV
 	help
 	help
 	  Support running as a Xen PV guest.
 	  Support running as a Xen PV guest.
 
 
+config XEN_PV_SMP
+	def_bool y
+	depends on XEN_PV && SMP
+
 config XEN_DOM0
 config XEN_DOM0
 	bool "Xen PV Dom0 support"
 	bool "Xen PV Dom0 support"
 	default y
 	default y

+ 5 - 4
arch/x86/xen/Makefile

@@ -12,16 +12,17 @@ CFLAGS_mmu_pv.o		:= $(nostackp)
 
 
 obj-y		:= enlighten.o multicalls.o mmu.o irq.o \
 obj-y		:= enlighten.o multicalls.o mmu.o irq.o \
 			time.o xen-asm.o xen-asm_$(BITS).o \
 			time.o xen-asm.o xen-asm_$(BITS).o \
-			grant-table.o suspend.o platform-pci-unplug.o \
-			p2m.o enlighten_pv.o mmu_pv.o
+			grant-table.o suspend.o platform-pci-unplug.o
 
 
 obj-$(CONFIG_XEN_PVHVM)		+= enlighten_hvm.o mmu_hvm.o suspend_hvm.o
 obj-$(CONFIG_XEN_PVHVM)		+= enlighten_hvm.o mmu_hvm.o suspend_hvm.o
-obj-$(CONFIG_XEN_PV)			+= setup.o apic.o pmu.o suspend_pv.o
+obj-$(CONFIG_XEN_PV)			+= setup.o apic.o pmu.o suspend_pv.o \
+						p2m.o enlighten_pv.o mmu_pv.o
 obj-$(CONFIG_XEN_PVH)			+= enlighten_pvh.o
 obj-$(CONFIG_XEN_PVH)			+= enlighten_pvh.o
 
 
 obj-$(CONFIG_EVENT_TRACING) += trace.o
 obj-$(CONFIG_EVENT_TRACING) += trace.o
 
 
-obj-$(CONFIG_SMP)		+= smp.o smp_pv.o
+obj-$(CONFIG_SMP)		+= smp.o
+obj-$(CONFIG_XEN_PV_SMP)  	+= smp_pv.o
 obj-$(CONFIG_XEN_PVHVM_SMP)  	+= smp_hvm.o
 obj-$(CONFIG_XEN_PVHVM_SMP)  	+= smp_hvm.o
 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
 obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o
 obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o
 obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o