From da9775509b74f1c54d9bdce3323702836315ef2b Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Thu, 19 Dec 2013 11:32:42 -0800
Subject: [PATCH] Fix aarch64 custom assembler now non-uapi is gone.

Change-Id: I9c8ad17d9bae2de9d793444d87d4ee133728e900
---
 libc/arch-aarch64/bionic/futex_aarch64.S | 4 +---
 libc/arch-aarch64/bionic/syscall.S       | 3 +--
 libc/arch-aarch64/bionic/vfork.S         | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/libc/arch-aarch64/bionic/futex_aarch64.S b/libc/arch-aarch64/bionic/futex_aarch64.S
index c25d2ddd0..bf7959b17 100644
--- a/libc/arch-aarch64/bionic/futex_aarch64.S
+++ b/libc/arch-aarch64/bionic/futex_aarch64.S
@@ -26,9 +26,7 @@
  * SUCH DAMAGE.
  */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 #define FUTEX_WAIT 0
 #define FUTEX_WAKE 1
diff --git a/libc/arch-aarch64/bionic/syscall.S b/libc/arch-aarch64/bionic/syscall.S
index f7ce010a8..863e36968 100644
--- a/libc/arch-aarch64/bionic/syscall.S
+++ b/libc/arch-aarch64/bionic/syscall.S
@@ -26,8 +26,7 @@
  * SUCH DAMAGE.
  */
 
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(syscall)
     /* create AAPCS frame pointer */
diff --git a/libc/arch-aarch64/bionic/vfork.S b/libc/arch-aarch64/bionic/vfork.S
index 964f38d0c..723528319 100644
--- a/libc/arch-aarch64/bionic/vfork.S
+++ b/libc/arch-aarch64/bionic/vfork.S
@@ -26,9 +26,7 @@
  * SUCH DAMAGE.
  */
 
-#include <asm/unistd.h>
-#include <linux/err.h>
-#include <machine/asm.h>
+#include <private/bionic_asm.h>
 
 ENTRY(vfork)
     mov     x0, #0x4111     /* CLONE_VM | CLONE_VFORK | SIGCHLD */