git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
[pandora-kernel.git]
/
arch
/
ia64
/
kvm
/
vcpu.c
diff --git
a/arch/ia64/kvm/vcpu.c
b/arch/ia64/kvm/vcpu.c
index
d4d2805
..
a18ee17
100644
(file)
--- 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);