projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'pinctrl-v4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[firefly-linux-kernel-4.4.55.git]
/
arch
/
powerpc
/
kvm
/
book3s_hv_rmhandlers.S
diff --git
a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index 4d70df26c402c7f59f4bc8468f93afec162c1f8d..faa86e9c05510973001b7d3c64557e8a9cbd212d 100644
(file)
--- a/
arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/
arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@
-324,7
+324,7
@@
kvm_start_guest:
kvm_secondary_got_guest:
/* Set HSTATE_DSCR(r13) to something sensible */
- ld r6, PACA_DSCR(r13)
+ ld r6, PACA_DSCR
_DEFAULT
(r13)
std r6, HSTATE_DSCR(r13)
/* Order load of vcore, ptid etc. after load of vcpu */