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/include/asm | |
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/include/asm')
-rw-r--r-- | arch/powerpc/include/asm/kvm_host.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h index 5869a487e2e0..22801f802312 100644 --- a/arch/powerpc/include/asm/kvm_host.h +++ b/arch/powerpc/include/asm/kvm_host.h | |||
@@ -66,7 +66,7 @@ struct kvm_vcpu_stat { | |||
66 | u32 dec_exits; | 66 | u32 dec_exits; |
67 | u32 ext_intr_exits; | 67 | u32 ext_intr_exits; |
68 | u32 halt_wakeup; | 68 | u32 halt_wakeup; |
69 | #ifdef CONFIG_PPC64 | 69 | #ifdef CONFIG_PPC_BOOK3S |
70 | u32 pf_storage; | 70 | u32 pf_storage; |
71 | u32 pf_instruc; | 71 | u32 pf_instruc; |
72 | u32 sp_storage; | 72 | u32 sp_storage; |
@@ -160,7 +160,7 @@ struct hpte_cache { | |||
160 | struct kvm_vcpu_arch { | 160 | struct kvm_vcpu_arch { |
161 | ulong host_stack; | 161 | ulong host_stack; |
162 | u32 host_pid; | 162 | u32 host_pid; |
163 | #ifdef CONFIG_PPC64 | 163 | #ifdef CONFIG_PPC_BOOK3S |
164 | ulong host_msr; | 164 | ulong host_msr; |
165 | ulong host_r2; | 165 | ulong host_r2; |
166 | void *host_retip; | 166 | void *host_retip; |
@@ -201,7 +201,7 @@ struct kvm_vcpu_arch { | |||
201 | #endif | 201 | #endif |
202 | 202 | ||
203 | ulong msr; | 203 | ulong msr; |
204 | #ifdef CONFIG_PPC64 | 204 | #ifdef CONFIG_PPC_BOOK3S |
205 | ulong shadow_msr; | 205 | ulong shadow_msr; |
206 | ulong shadow_srr1; | 206 | ulong shadow_srr1; |
207 | ulong hflags; | 207 | ulong hflags; |
@@ -283,7 +283,7 @@ struct kvm_vcpu_arch { | |||
283 | u64 dec_jiffies; | 283 | u64 dec_jiffies; |
284 | unsigned long pending_exceptions; | 284 | unsigned long pending_exceptions; |
285 | 285 | ||
286 | #ifdef CONFIG_PPC64 | 286 | #ifdef CONFIG_PPC_BOOK3S |
287 | struct hpte_cache hpte_cache[HPTEG_CACHE_NUM]; | 287 | struct hpte_cache hpte_cache[HPTEG_CACHE_NUM]; |
288 | int hpte_cache_offset; | 288 | int hpte_cache_offset; |
289 | #endif | 289 | #endif |