diff options
| author | Felix Blyakher <felixb@sgi.com> | 2009-04-01 16:58:39 -0500 |
|---|---|---|
| committer | Felix Blyakher <felixb@sgi.com> | 2009-04-01 16:58:39 -0500 |
| commit | f36345ff9a4a77f2cc576a2777b6256d5c8798fa (patch) | |
| tree | 7ae4c607f6baae74060c2e385f744e171fbbf92b /arch/ia64/kvm/vcpu.c | |
| parent | 1aacc064e029f0017384e463121b98f06d3a2cc3 (diff) | |
| parent | 8b53ef33d9d8fa5f771ae11cc6a6e7bc0182beec (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-linus
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 d4d28050587..a18ee17b919 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, else *rnat_addr = (*rnat_addr) & (~nat_mask); - ia64_setreg(_IA64_REG_AR_BSPSTORE, bspstore); + ia64_setreg(_IA64_REG_AR_BSPSTORE, (unsigned long)bspstore); ia64_setreg(_IA64_REG_AR_RNAT, rnat); } local_irq_restore(psr); |