diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-04 15:59:53 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-09-04 15:59:53 (GMT) |
| commit | 02cf1da2548d318ad4db9eb4cf8656e24b11aefc (patch) | |
| tree | b966cb8239e1a934c2a91da67162b7a7a7b5ac8d /arch/tile/kernel/intvec_32.S | |
| parent | a4fdb2a46f617b8b2cd47acec026ec16532edbc6 (diff) | |
| parent | 8d03bc56cc27ddd93f70a630686ef06289787c78 (diff) | |
| download | linux-02cf1da2548d318ad4db9eb4cf8656e24b11aefc.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull tile updates from Chris Metcalf:
"This includes secure computing support as well as miscellaneous minor
improvements"
* git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
tile: correct some typos in opcode type names
tile/vdso: emit a GNU hash as well
tile: Remove finish_arch_switch
tile: enable full SECCOMP support
tile/time: Migrate to new 'set-state' interface
Diffstat (limited to 'arch/tile/kernel/intvec_32.S')
| -rw-r--r-- | arch/tile/kernel/intvec_32.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/tile/kernel/intvec_32.S b/arch/tile/kernel/intvec_32.S index cdbda45..fbbe2ea 100644 --- a/arch/tile/kernel/intvec_32.S +++ b/arch/tile/kernel/intvec_32.S @@ -1224,6 +1224,7 @@ handle_syscall: jal do_syscall_trace_enter } FEEDBACK_REENTER(handle_syscall) + blz r0, .Lsyscall_sigreturn_skip /* * We always reload our registers from the stack at this |