mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 05:48:40 +00:00
KVM: PPC: E500: Move write_stlbe higher
Later patches want to call the function and it doesn't have dependencies on anything below write_host_tlbe. Move it higher up in the file. Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
parent
141687869f
commit
9445ef0181
1 changed files with 16 additions and 16 deletions
|
@ -156,6 +156,22 @@ static inline void write_host_tlbe(struct kvmppc_vcpu_e500 *vcpu_e500,
|
|||
}
|
||||
}
|
||||
|
||||
/* sesel is for tlb1 only */
|
||||
static void write_stlbe(struct kvmppc_vcpu_e500 *vcpu_e500,
|
||||
struct kvm_book3e_206_tlb_entry *gtlbe,
|
||||
struct kvm_book3e_206_tlb_entry *stlbe,
|
||||
int stlbsel, int sesel)
|
||||
{
|
||||
int stid;
|
||||
|
||||
preempt_disable();
|
||||
stid = kvmppc_e500_get_tlb_stid(&vcpu_e500->vcpu, gtlbe);
|
||||
|
||||
stlbe->mas1 |= MAS1_TID(stid);
|
||||
write_host_tlbe(vcpu_e500, stlbsel, sesel, stlbe);
|
||||
preempt_enable();
|
||||
}
|
||||
|
||||
#ifdef CONFIG_KVM_E500V2
|
||||
void kvmppc_map_magic(struct kvm_vcpu *vcpu)
|
||||
{
|
||||
|
@ -834,22 +850,6 @@ int kvmppc_e500_emul_tlbsx(struct kvm_vcpu *vcpu, gva_t ea)
|
|||
return EMULATE_DONE;
|
||||
}
|
||||
|
||||
/* sesel is for tlb1 only */
|
||||
static void write_stlbe(struct kvmppc_vcpu_e500 *vcpu_e500,
|
||||
struct kvm_book3e_206_tlb_entry *gtlbe,
|
||||
struct kvm_book3e_206_tlb_entry *stlbe,
|
||||
int stlbsel, int sesel)
|
||||
{
|
||||
int stid;
|
||||
|
||||
preempt_disable();
|
||||
stid = kvmppc_e500_get_tlb_stid(&vcpu_e500->vcpu, gtlbe);
|
||||
|
||||
stlbe->mas1 |= MAS1_TID(stid);
|
||||
write_host_tlbe(vcpu_e500, stlbsel, sesel, stlbe);
|
||||
preempt_enable();
|
||||
}
|
||||
|
||||
int kvmppc_e500_emul_tlbwe(struct kvm_vcpu *vcpu)
|
||||
{
|
||||
struct kvmppc_vcpu_e500 *vcpu_e500 = to_e500(vcpu);
|
||||
|
|
Loading…
Reference in a new issue