diff options
author | Alexander Graf <agraf@suse.de> | 2010-04-15 18:11:42 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2010-05-17 05:18:29 -0400 |
commit | 00c3a37ca332f54f2187720e51f7c0e18e91d7c9 (patch) | |
tree | c6544905f7b67d892596c03ccea38892efbc75a8 /arch/powerpc/kvm/emulate.c | |
parent | c14dea04a248a59fe01f1b49ac94615042016558 (diff) |
KVM: PPC: Use CONFIG_PPC_BOOK3S define
Upstream recently added a new name for PPC64: Book3S_64.
So instead of using CONFIG_PPC64 we should use CONFIG_PPC_BOOK3S consotently.
That makes understanding the code easier (I hope).
Signed-off-by: Alexander Graf <agraf@suse.de>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm/emulate.c')
-rw-r--r-- | arch/powerpc/kvm/emulate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c index c6db28cdc594..b608c0b0beb5 100644 --- a/arch/powerpc/kvm/emulate.c +++ b/arch/powerpc/kvm/emulate.c | |||
@@ -69,7 +69,7 @@ | |||
69 | #define OP_STH 44 | 69 | #define OP_STH 44 |
70 | #define OP_STHU 45 | 70 | #define OP_STHU 45 |
71 | 71 | ||
72 | #ifdef CONFIG_PPC64 | 72 | #ifdef CONFIG_PPC_BOOK3S |
73 | static int kvmppc_dec_enabled(struct kvm_vcpu *vcpu) | 73 | static int kvmppc_dec_enabled(struct kvm_vcpu *vcpu) |
74 | { | 74 | { |
75 | return 1; | 75 | return 1; |
@@ -86,7 +86,7 @@ void kvmppc_emulate_dec(struct kvm_vcpu *vcpu) | |||
86 | unsigned long dec_nsec; | 86 | unsigned long dec_nsec; |
87 | 87 | ||
88 | pr_debug("mtDEC: %x\n", vcpu->arch.dec); | 88 | pr_debug("mtDEC: %x\n", vcpu->arch.dec); |
89 | #ifdef CONFIG_PPC64 | 89 | #ifdef CONFIG_PPC_BOOK3S |
90 | /* mtdec lowers the interrupt line when positive. */ | 90 | /* mtdec lowers the interrupt line when positive. */ |
91 | kvmppc_core_dequeue_dec(vcpu); | 91 | kvmppc_core_dequeue_dec(vcpu); |
92 | 92 | ||
@@ -153,7 +153,7 @@ int kvmppc_emulate_instruction(struct kvm_run *run, struct kvm_vcpu *vcpu) | |||
153 | 153 | ||
154 | switch (get_op(inst)) { | 154 | switch (get_op(inst)) { |
155 | case OP_TRAP: | 155 | case OP_TRAP: |
156 | #ifdef CONFIG_PPC64 | 156 | #ifdef CONFIG_PPC_BOOK3S |
157 | case OP_TRAP_64: | 157 | case OP_TRAP_64: |
158 | kvmppc_core_queue_program(vcpu, SRR1_PROGTRAP); | 158 | kvmppc_core_queue_program(vcpu, SRR1_PROGTRAP); |
159 | #else | 159 | #else |