Merge branch 'master' into upstream

[mv-sheeva.git] / arch / um / os-Linux / tls.c

diff --git a/arch/um/os-Linux/tls.c b/arch/um/os-Linux/tls.c
index a2de2580b8af4716593832ef880d1c930042c21b..16215b9908040a6f36e4462c1f117683e81e3805 100644 (file)
--- a/arch/um/os-Linux/tls.c
+++ b/arch/um/os-Linux/tls.c
@@ -1,4 +1,5 @@
 #include <errno.h>
+#include <unistd.h>
 #include <sys/ptrace.h>
 #include <sys/syscall.h>
 #include <asm/ldt.h>