From 4cdde5f12364079a2b55fa4fc4ed53364cb8465d Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 21 Mar 2013 22:48:18 -0700
Subject: [PATCH] Replace unnecessary x86 uses of <sys/linux-syscalls.h> with
 <asm/unistd.h>.

Change-Id: I9d016ee8e8329cccf244d27c336d9524348af996
---
 libc/arch-x86/bionic/_exit_with_stack_teardown.S | 2 +-
 libc/arch-x86/bionic/clone.S                     | 2 +-
 libc/arch-x86/bionic/futex_x86.S                 | 2 +-
 libc/arch-x86/bionic/syscall.S                   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libc/arch-x86/bionic/_exit_with_stack_teardown.S b/libc/arch-x86/bionic/_exit_with_stack_teardown.S
index e2bb6ad7d..aad3f0ba3 100644
--- a/libc/arch-x86/bionic/_exit_with_stack_teardown.S
+++ b/libc/arch-x86/bionic/_exit_with_stack_teardown.S
@@ -1,5 +1,5 @@
+#include <asm/unistd.h>
 #include <machine/asm.h>
-#include <sys/linux-syscalls.h>
 
 // void _exit_with_stack_teardown(void *stackBase, int stackSize, int *retCode)
 ENTRY(_exit_with_stack_teardown)
diff --git a/libc/arch-x86/bionic/clone.S b/libc/arch-x86/bionic/clone.S
index 80e3c7579..457cb4a8f 100644
--- a/libc/arch-x86/bionic/clone.S
+++ b/libc/arch-x86/bionic/clone.S
@@ -1,5 +1,5 @@
+#include <asm/unistd.h>
 #include <machine/asm.h>
-#include <sys/linux-syscalls.h>
 
 // int  __pthread_clone(void* (*fn)(void*), void* tls, int flags, void* arg);
 ENTRY(__pthread_clone)
diff --git a/libc/arch-x86/bionic/futex_x86.S b/libc/arch-x86/bionic/futex_x86.S
index 36a28e8f8..fa3375858 100644
--- a/libc/arch-x86/bionic/futex_x86.S
+++ b/libc/arch-x86/bionic/futex_x86.S
@@ -1,5 +1,5 @@
+#include <asm/unistd.h>
 #include <machine/asm.h>
-#include <sys/linux-syscalls.h>
 
 #define FUTEX_WAIT 0
 #define FUTEX_WAKE 1
diff --git a/libc/arch-x86/bionic/syscall.S b/libc/arch-x86/bionic/syscall.S
index ef816b60d..4452da456 100644
--- a/libc/arch-x86/bionic/syscall.S
+++ b/libc/arch-x86/bionic/syscall.S
@@ -10,8 +10,8 @@
  *	%ebp: arg5                -   callee save
  */
 
+#include <asm/unistd.h>
 #include <machine/asm.h>
-#include <sys/linux-syscalls.h>
 
 ENTRY(syscall)
     # Push the callee save registers.