Now we have everything in place to be able to build KVM, so let's add it as config option and in the Makefile.
Signed-off-by: Alexander Graf <[email protected]> --- arch/powerpc/kvm/Kconfig | 17 +++++++++++++++++ arch/powerpc/kvm/Makefile | 15 ++++++++++++++- 2 files changed, 31 insertions(+), 1 deletions(-) diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig index c299268..a9339dd 100644 --- a/arch/powerpc/kvm/Kconfig +++ b/arch/powerpc/kvm/Kconfig @@ -21,6 +21,23 @@ config KVM select PREEMPT_NOTIFIERS select ANON_INODES +config KVM_970_HANDLER + bool + +config KVM_970 + tristate "KVM support for PowerPC 970 processors" + depends on EXPERIMENTAL && PPC64 + select KVM + select KVM_970_HANDLER + ---help--- + Support running unmodified 970 and 750 guest kernels in virtual + machines on 970 host processors. + + This module provides access to the hardware capabilities through + a character device node named /dev/kvm. + + If unsure, say N. + config KVM_440 bool "KVM support for PowerPC 440 processors" depends on EXPERIMENTAL && 44x diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile index 37655fe..dcb09be 100644 --- a/arch/powerpc/kvm/Makefile +++ b/arch/powerpc/kvm/Makefile @@ -14,11 +14,12 @@ CFLAGS_emulate.o := -I. kvm-objs := $(common-objs-y) powerpc.o emulate.o obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o -obj-$(CONFIG_KVM) += kvm.o +obj-$(CONFIG_KVM_970_HANDLER) += 970_exports.o AFLAGS_booke_interrupts.o := -I$(obj) kvm-440-objs := \ + $(kvm-objs) \ booke.o \ booke_emulate.o \ booke_interrupts.o \ @@ -28,6 +29,7 @@ kvm-440-objs := \ obj-$(CONFIG_KVM_440) += kvm-440.o kvm-e500-objs := \ + $(kvm-objs) \ booke.o \ booke_emulate.o \ booke_interrupts.o \ @@ -35,3 +37,14 @@ kvm-e500-objs := \ e500_tlb.o \ e500_emulate.o obj-$(CONFIG_KVM_E500) += kvm-e500.o + +kvm-970-objs := \ + $(kvm-objs) \ + 970.o \ + 970_emulate.o \ + 970_interrupts.o \ + 970_mmu_host.o \ + 970_mmu.o \ + 74xx_mmu.o +obj-$(CONFIG_KVM_970) += kvm-970.o + -- 1.6.0.2 -- To unsubscribe from this list: send the line "unsubscribe kvm-ppc" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
