Merge "Replace unnecessary ARM uses of <sys/linux-syscalls.h> with <asm/unistd.h>."
diff --git a/libc/arch-mips/bionic/clone.S b/libc/arch-mips/bionic/clone.S
index 007e909..94e18a2 100644
--- a/libc/arch-mips/bionic/clone.S
+++ b/libc/arch-mips/bionic/clone.S
@@ -25,9 +25,10 @@
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
-#include <linux/sched.h>
-#include <sys/linux-syscalls.h>
+
+#include <asm/unistd.h>
#include <linux/errno.h>
+#include <linux/sched.h>
.text
.type __pthread_clone, @function
diff --git a/libc/arch-x86/bionic/_exit_with_stack_teardown.S b/libc/arch-x86/bionic/_exit_with_stack_teardown.S
index e2bb6ad..aad3f0b 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 80e3c75..457cb4a 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 36a28e8..fa33758 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 ef816b6..4452da4 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.
