>From bd633a2fff2e4180f607906c3aafcc7185931577 Mon Sep 17 00:00:00 2001 From: Mickael Guene Date: Wed, 20 May 2015 09:49:12 +0200 Subject: [PATCH 3/5] fdpic: Add get_tls syscall Change-Id: Ic270fd389762e69ade162375967945b557067cd5 Signed-off-by: Mickael Guene Conflicts: arch/arm/kernel/traps.c --- arch/arm/include/uapi/asm/unistd.h | 1 + arch/arm/kernel/traps.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h index ede692ffa32e..f387fb1ce8cc 100644 --- a/arch/arm/include/uapi/asm/unistd.h +++ b/arch/arm/include/uapi/asm/unistd.h @@ -427,6 +427,7 @@ #define __ARM_NR_usr26 (__ARM_NR_BASE+3) #define __ARM_NR_usr32 (__ARM_NR_BASE+4) #define __ARM_NR_set_tls (__ARM_NR_BASE+5) +#define __ARM_NR_get_tls (__ARM_NR_BASE+6) /* * The following syscalls are obsolete and no longer available for EABI. diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index bc698383e822..1ba16ec2bfdf 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -625,6 +625,9 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) set_tls(regs->ARM_r0); return 0; + case NR(get_tls): + return thread->tp_value[0]; + default: /* Calls 9f00xx..9f07ff are defined to return -ENOSYS if not implemented, rather than raising SIGILL. This -- 1.9.1