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 branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
[firefly-linux-kernel-4.4.55.git]
/
arch
/
arm64
/
kernel
/
entry.S
diff --git
a/arch/arm64/kernel/entry.S
b/arch/arm64/kernel/entry.S
index 84c921966d471c1fe2e8cd62e7236c2bd9de5bfd..8606895240bab606c806267aa815e43fc66318db 100644
(file)
--- a/
arch/arm64/kernel/entry.S
+++ b/
arch/arm64/kernel/entry.S
@@
-318,6
+318,7
@@
tsk .req x28 // current thread_info
/*
* Exception vectors.
*/
+ .pushsection ".entry.text", "ax"
.align 11
ENTRY(vectors)
@@
-857,6
+858,8
@@
__ni_sys_trace:
bl do_ni_syscall
b __sys_trace_return
+ .popsection // .entry.text
+
/*
* Special system call wrappers.
*/