Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are a raw update to a vanilla kernel 4.1.10, with the
[kvmfornfv.git]
/
kernel
/
arch
/
xtensa
/
kernel
/
entry.S
diff --git
a/kernel/arch/xtensa/kernel/entry.S
b/kernel/arch/xtensa/kernel/entry.S
index
82bbfa5
..
a2a9021
100644
(file)
--- a/
kernel/arch/xtensa/kernel/entry.S
+++ b/
kernel/arch/xtensa/kernel/entry.S
@@
-568,12
+568,13
@@
user_exception_exit:
* (if we have restored WSBITS-1 frames).
*/
* (if we have restored WSBITS-1 frames).
*/
+2:
#if XCHAL_HAVE_THREADPTR
l32i a3, a1, PT_THREADPTR
wur a3, threadptr
#endif
#if XCHAL_HAVE_THREADPTR
l32i a3, a1, PT_THREADPTR
wur a3, threadptr
#endif
-
2:
j common_exception_exit
+
j common_exception_exit
/* This is the kernel exception exit.
* We avoided to do a MOVSP when we entered the exception, but we
/* This is the kernel exception exit.
* We avoided to do a MOVSP when we entered the exception, but we
@@
-1820,7
+1821,7
@@
ENDPROC(system_call)
mov a12, a0
.endr
#endif
mov a12, a0
.endr
#endif
- _entry a1,
48
+ _entry a1,
16
#if XCHAL_NUM_AREGS % 12 == 0
mov a8, a8
#elif XCHAL_NUM_AREGS % 12 == 4
#if XCHAL_NUM_AREGS % 12 == 0
mov a8, a8
#elif XCHAL_NUM_AREGS % 12 == 4
@@
-1844,7
+1845,7
@@
ENDPROC(system_call)
ENTRY(_switch_to)
ENTRY(_switch_to)
- entry a1,
16
+ entry a1,
48
mov a11, a3 # and 'next' (a3)
mov a11, a3 # and 'next' (a3)