diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-11-08 20:42:47 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-11-08 20:42:47 +0100 |
| commit | 02196144a0a0ad71fb75bd4a5a4785ab36c3b78e (patch) | |
| tree | b87fe75626250a456604a331faf3594b4f3925a8 /arch/arm/kernel/traps.c | |
| parent | Merge branches 'fixes', 'misc' and 'sa1111-for-next' into for-next (diff) | |
| parent | ARM: 8719/1: NOMMU: work around maybe-uninitialized warning (diff) | |
| download | linux-02196144a0a0ad71fb75bd4a5a4785ab36c3b78e.tar.xz linux-02196144a0a0ad71fb75bd4a5a4785ab36c3b78e.zip | |
Merge branch 'devel-stable' into for-next
Diffstat (limited to 'arch/arm/kernel/traps.c')
| -rw-r--r-- | arch/arm/kernel/traps.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 0fcd82f01388..5cf04888c581 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -655,6 +655,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) set_tls(regs->ARM_r0); return 0; + case NR(get_tls): + return current_thread_info()->tp_value[0]; + default: /* Calls 9f00xx..9f07ff are defined to return -ENOSYS if not implemented, rather than raising SIGILL. This |