diff options
| author | Tony Luck <aegl@agluck-desktop.(none)> | 2009-03-31 17:25:08 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-03-31 17:25:08 -0400 |
| commit | c66b31f3926165bc1d4128adc97a064dcbab421a (patch) | |
| tree | 13be75d33bd2b9d4ec45ec512ac38a2e7069062e /arch/ia64/kvm/vcpu.c | |
| parent | 50fbe56c127efde659c686495eb1f925fd84ff0a (diff) | |
| parent | 7120569c76028a6883697b7643564f0c419cfe07 (diff) | |
Pull pvops into release branch
Diffstat (limited to 'arch/ia64/kvm/vcpu.c')
| -rw-r--r-- | arch/ia64/kvm/vcpu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kvm/vcpu.c b/arch/ia64/kvm/vcpu.c index d4d280505878..a18ee17b9192 100644 --- a/arch/ia64/kvm/vcpu.c +++ b/arch/ia64/kvm/vcpu.c | |||
| @@ -386,7 +386,7 @@ void set_rse_reg(struct kvm_pt_regs *regs, unsigned long r1, | |||
| 386 | else | 386 | else |
| 387 | *rnat_addr = (*rnat_addr) & (~nat_mask); | 387 | *rnat_addr = (*rnat_addr) & (~nat_mask); |
| 388 | 388 | ||
| 389 | ia64_setreg(_IA64_REG_AR_BSPSTORE, bspstore); | 389 | ia64_setreg(_IA64_REG_AR_BSPSTORE, (unsigned long)bspstore); |
| 390 | ia64_setreg(_IA64_REG_AR_RNAT, rnat); | 390 | ia64_setreg(_IA64_REG_AR_RNAT, rnat); |
| 391 | } | 391 | } |
| 392 | local_irq_restore(psr); | 392 | local_irq_restore(psr); |