From 1eb7e3ecd2f427f92e1c61aa65e11566c80984b1 Mon Sep 17 00:00:00 2001
From: Jeff Dike <jdike@addtoit.com>
Date: Thu, 2 Nov 2006 22:07:23 -0800
Subject: [PATCH] --- yaml --- r: 40666 b: refs/heads/master c:
 1f6f61649d8c64d7a3a4d143405df9a7bdd4af10 h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/um/os-Linux/process.c      | 1 -
 trunk/arch/um/os-Linux/skas/process.c | 2 +-
 trunk/arch/um/os-Linux/tls.c          | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 95d080d535d9..e58b0c1cd1e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 53b173327d283b9bdbfb0c3b6de6f0eb197819d6
+refs/heads/master: 1f6f61649d8c64d7a3a4d143405df9a7bdd4af10
diff --git a/trunk/arch/um/os-Linux/process.c b/trunk/arch/um/os-Linux/process.c
index 51f0893640a6..c692a192957a 100644
--- a/trunk/arch/um/os-Linux/process.c
+++ b/trunk/arch/um/os-Linux/process.c
@@ -7,7 +7,6 @@
 #include <stdio.h>
 #include <errno.h>
 #include <signal.h>
-#include <linux/unistd.h>
 #include <sys/mman.h>
 #include <sys/wait.h>
 #include <sys/mman.h>
diff --git a/trunk/arch/um/os-Linux/skas/process.c b/trunk/arch/um/os-Linux/skas/process.c
index cb9ab54146cc..9b34fe65949a 100644
--- a/trunk/arch/um/os-Linux/skas/process.c
+++ b/trunk/arch/um/os-Linux/skas/process.c
@@ -14,7 +14,7 @@
 #include <sys/mman.h>
 #include <sys/user.h>
 #include <sys/time.h>
-#include <asm/unistd.h>
+#include <sys/syscall.h>
 #include <asm/types.h>
 #include "user.h"
 #include "sysdep/ptrace.h"
diff --git a/trunk/arch/um/os-Linux/tls.c b/trunk/arch/um/os-Linux/tls.c
index 9f7999f27c77..16215b990804 100644
--- a/trunk/arch/um/os-Linux/tls.c
+++ b/trunk/arch/um/os-Linux/tls.c
@@ -1,7 +1,7 @@
 #include <errno.h>
+#include <unistd.h>
 #include <sys/ptrace.h>
 #include <sys/syscall.h>
-#include <unistd.h>
 #include <asm/ldt.h>
 #include "sysdep/tls.h"
 #include "uml-config.h"