aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kvm/e500.h
diff options
context:
space:
mode:
authorAlexander Graf <agraf@suse.de>2012-02-15 18:40:00 -0500
committerAvi Kivity <avi@redhat.com>2012-04-08 05:54:57 -0400
commitbf7ca4bdcb8f1eb15d11879efa824b45443ddb69 (patch)
treeda2e532462cadb2121badb1f477972ecda3dc911 /arch/powerpc/kvm/e500.h
parent1d628af78a28c77143bcdd4ed09e93bb235d4198 (diff)
KVM: PPC: rename CONFIG_KVM_E500 -> CONFIG_KVM_E500V2
The CONFIG_KVM_E500 option really indicates that we're running on a V2 machine, not on a machine of the generic E500 class. So indicate that properly and change the config name accordingly. Signed-off-by: Alexander Graf <agraf@suse.de> Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/powerpc/kvm/e500.h')
-rw-r--r--arch/powerpc/kvm/e500.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/kvm/e500.h b/arch/powerpc/kvm/e500.h
index 31430852ba74..7967f3f10a16 100644
--- a/arch/powerpc/kvm/e500.h
+++ b/arch/powerpc/kvm/e500.h
@@ -39,7 +39,7 @@ struct tlbe_priv {
39 struct tlbe_ref ref; /* TLB0 only -- TLB1 uses tlb_refs */ 39 struct tlbe_ref ref; /* TLB0 only -- TLB1 uses tlb_refs */
40}; 40};
41 41
42#ifdef CONFIG_KVM_E500 42#ifdef CONFIG_KVM_E500V2
43struct vcpu_id_table; 43struct vcpu_id_table;
44#endif 44#endif
45 45
@@ -89,7 +89,7 @@ struct kvmppc_vcpu_e500 {
89 u64 *g2h_tlb1_map; 89 u64 *g2h_tlb1_map;
90 unsigned int *h2g_tlb1_rmap; 90 unsigned int *h2g_tlb1_rmap;
91 91
92#ifdef CONFIG_KVM_E500 92#ifdef CONFIG_KVM_E500V2
93 u32 pid[E500_PID_NUM]; 93 u32 pid[E500_PID_NUM];
94 94
95 /* vcpu id table */ 95 /* vcpu id table */
@@ -136,7 +136,7 @@ void kvmppc_get_sregs_e500_tlb(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs);
136int kvmppc_set_sregs_e500_tlb(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs); 136int kvmppc_set_sregs_e500_tlb(struct kvm_vcpu *vcpu, struct kvm_sregs *sregs);
137 137
138 138
139#ifdef CONFIG_KVM_E500 139#ifdef CONFIG_KVM_E500V2
140unsigned int kvmppc_e500_get_sid(struct kvmppc_vcpu_e500 *vcpu_e500, 140unsigned int kvmppc_e500_get_sid(struct kvmppc_vcpu_e500 *vcpu_e500,
141 unsigned int as, unsigned int gid, 141 unsigned int as, unsigned int gid,
142 unsigned int pr, int avoid_recursion); 142 unsigned int pr, int avoid_recursion);