lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: PPC: Use KVM_BOOK3S_HANDLER

Browse Source 
So far we had a lot of conditional code on CONFIG_KVM_BOOK3S_64_HANDLER.
As we're moving towards common code between 32 and 64 bits, most of
these ifdefs can be moved to a more generic term define, called
CONFIG_KVM_BOOK3S_HANDLER.

This patch adds the new generic config option and moves ifdefs over.

Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
Alexander Graf
2010-04-16 00:11:41 +02:00
committed by Avi Kivity
parent c7f38f46f2
commit c14dea04a2
4 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/include/asm/kvm_book3s_asm.h
View File

@@ -22,7 +22,7 @@
#ifdef __ASSEMBLY__ #ifdef __ASSEMBLY__
#ifdef CONFIG_KVM_BOOK3S_64_HANDLER #ifdef CONFIG_KVM_BOOK3S_HANDLER
#include <asm/kvm_asm.h> #include <asm/kvm_asm.h>
@@ -55,7 +55,7 @@ kvmppc_resume_\intno:
.macro DO_KVM intno .macro DO_KVM intno
.endm .endm
#endif /* CONFIG_KVM_BOOK3S_64_HANDLER */ #endif /* CONFIG_KVM_BOOK3S_HANDLER */
#else /*__ASSEMBLY__ */ #else /*__ASSEMBLY__ */

2
arch/powerpc/include/asm/paca.h
View File

@@ -136,7 +136,7 @@ struct paca_struct {
u64 startpurr; /* PURR/TB value snapshot */ u64 startpurr; /* PURR/TB value snapshot */
u64 startspurr; /* SPURR value snapshot */ u64 startspurr; /* SPURR value snapshot */
#ifdef CONFIG_KVM_BOOK3S_64_HANDLER #ifdef CONFIG_KVM_BOOK3S_HANDLER
struct { struct {
u64 esid; u64 esid;
u64 vsid; u64 vsid;

4
arch/powerpc/kvm/Kconfig
View File

@@ -22,8 +22,12 @@ config KVM
select ANON_INODES select ANON_INODES
select KVM_MMIO select KVM_MMIO
config KVM_BOOK3S_HANDLER
bool
config KVM_BOOK3S_64_HANDLER config KVM_BOOK3S_64_HANDLER
bool bool
select KVM_BOOK3S_HANDLER
config KVM_BOOK3S_64 config KVM_BOOK3S_64
tristate "KVM support for PowerPC book3s_64 processors" tristate "KVM support for PowerPC book3s_64 processors"

2
arch/powerpc/kvm/Makefile
View File

@@ -14,7 +14,7 @@ CFLAGS_emulate.o := -I.
common-objs-y += powerpc.o emulate.o common-objs-y += powerpc.o emulate.o
obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o obj-$(CONFIG_KVM_EXIT_TIMING) += timing.o
obj-$(CONFIG_KVM_BOOK3S_64_HANDLER) += book3s_exports.o obj-$(CONFIG_KVM_BOOK3S_HANDLER) += book3s_exports.o
AFLAGS_booke_interrupts.o := -I$(obj) AFLAGS_booke_interrupts.o := -I$(obj)