am f850700c: am 2520a94e: am 1afb375d: Merge "Fix aarch64 custom assembler now non-uapi is gone."

* commit 'f850700c67f8a5f9641c91c53269f9a5a14d3399':
  Fix aarch64 custom assembler now non-uapi is gone.
This commit is contained in:
Elliott Hughes 2013-12-19 19:49:46 +00:00 committed by Android Git Automerger
commit c06eaa3e12
3 changed files with 3 additions and 8 deletions

View File

@ -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

View File

@ -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 */

View File

@ -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 */