Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
powerpc
/
kernel
/
entry_64.S
diff --git
a/kernel/arch/powerpc/kernel/entry_64.S
b/kernel/arch/powerpc/kernel/entry_64.S
index
5bb3148
..
1aae3fd
100644
(file)
--- a/
kernel/arch/powerpc/kernel/entry_64.S
+++ b/
kernel/arch/powerpc/kernel/entry_64.S
@@
-334,13
+334,13
@@
syscall_exit_work:
tabort_syscall:
/* Firstly we need to enable TM in the kernel */
mfmsr r10
tabort_syscall:
/* Firstly we need to enable TM in the kernel */
mfmsr r10
- li r
13
, 1
- rldimi r10, r
13
, MSR_TM_LG, 63-MSR_TM_LG
+ li r
9
, 1
+ rldimi r10, r
9
, MSR_TM_LG, 63-MSR_TM_LG
mtmsrd r10, 0
/* tabort, this dooms the transaction, nothing else */
mtmsrd r10, 0
/* tabort, this dooms the transaction, nothing else */
- li r
13
, (TM_CAUSE_SYSCALL|TM_CAUSE_PERSISTENT)
- TABORT(R
13
)
+ li r
9
, (TM_CAUSE_SYSCALL|TM_CAUSE_PERSISTENT)
+ TABORT(R
9
)
/*
* Return directly to userspace. We have corrupted user register state,
/*
* Return directly to userspace. We have corrupted user register state,
@@
-348,8
+348,8
@@
tabort_syscall:
* resume after the tbegin of the aborted transaction with the
* checkpointed register state.
*/
* resume after the tbegin of the aborted transaction with the
* checkpointed register state.
*/
- li r
13
, MSR_RI
- andc r10, r10, r
13
+ li r
9
, MSR_RI
+ andc r10, r10, r
9
mtmsrd r10, 1
mtspr SPRN_SRR0, r11
mtspr SPRN_SRR1, r12
mtmsrd r10, 1
mtspr SPRN_SRR0, r11
mtspr SPRN_SRR1, r12