Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[sfrench/cifs-2.6.git] / arch / um / os-Linux / sys-i386 / tls.c

diff --git a/arch/um/os-Linux/sys-i386/tls.c b/arch/um/os-Linux/sys-i386/tls.c
index 120abbe4e3ce2916d7d20eb7680dcdfd2a8c0baa..256532034c62d11b64bc87db21773749a79e3d76 100644 (file)
--- a/arch/um/os-Linux/sys-i386/tls.c
+++ b/arch/um/os-Linux/sys-i386/tls.c
@@ -1,10 +1,12 @@
 #include <errno.h>
 #include <linux/unistd.h>
+
+#include <sys/syscall.h>
+#include <unistd.h>
+
 #include "sysdep/tls.h"
 #include "user_util.h"
 
-static _syscall1(int, get_thread_area, user_desc_t *, u_info);
-
 /* Checks whether host supports TLS, and sets *tls_min according to the value
  * valid on the host.
  * i386 host have it == 6; x86_64 host have it == 12, for i386 emulation. */
@@ -17,7 +19,7 @@ void check_host_supports_tls(int *supports_tls, int *tls_min) {
                user_desc_t info;
                info.entry_number = val[i];
 
-               if (get_thread_area(&info) == 0) {
+               if (syscall(__NR_get_thread_area, &info) == 0) {
                        *tls_min = val[i];
                        *supports_tls = 1;
                        return;