← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/powerpc/kvm/book3s.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/powerpc/kvm/book3s.c
236
236
 
237
237
int kvmppc_core_pending_dec(struct kvm_vcpu *vcpu)
238
238
{
239
 
        return test_bit(BOOK3S_INTERRUPT_DECREMENTER >> 7, &vcpu->arch.pending_exceptions);
 
239
        return test_bit(BOOK3S_IRQPRIO_DECREMENTER, &vcpu->arch.pending_exceptions);
240
240
}
241
241
 
242
242
void kvmppc_core_dequeue_dec(struct kvm_vcpu *vcpu)
1141
1141
        regs->sprg1 = vcpu->arch.shared->sprg1;
1142
1142
        regs->sprg2 = vcpu->arch.shared->sprg2;
1143
1143
        regs->sprg3 = vcpu->arch.shared->sprg3;
1144
 
        regs->sprg5 = vcpu->arch.sprg4;
1145
 
        regs->sprg6 = vcpu->arch.sprg5;
1146
 
        regs->sprg7 = vcpu->arch.sprg6;
 
1144
        regs->sprg4 = vcpu->arch.sprg4;
 
1145
        regs->sprg5 = vcpu->arch.sprg5;
 
1146
        regs->sprg6 = vcpu->arch.sprg6;
 
1147
        regs->sprg7 = vcpu->arch.sprg7;
1147
1148
 
1148
1149
        for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)
1149
1150
                regs->gpr[i] = kvmppc_get_gpr(vcpu, i);
1167
1168
        vcpu->arch.shared->sprg1 = regs->sprg1;
1168
1169
        vcpu->arch.shared->sprg2 = regs->sprg2;
1169
1170
        vcpu->arch.shared->sprg3 = regs->sprg3;
1170
 
        vcpu->arch.sprg5 = regs->sprg4;
1171
 
        vcpu->arch.sprg6 = regs->sprg5;
1172
 
        vcpu->arch.sprg7 = regs->sprg6;
 
1171
        vcpu->arch.sprg4 = regs->sprg4;
 
1172
        vcpu->arch.sprg5 = regs->sprg5;
 
1173
        vcpu->arch.sprg6 = regs->sprg6;
 
1174
        vcpu->arch.sprg7 = regs->sprg7;
1173
1175
 
1174
1176
        for (i = 0; i < ARRAY_SIZE(regs->gpr); i++)
1175
1177
                kvmppc_set_gpr(vcpu, i, regs->gpr[i]);