Merge remote-tracking branch 'arm64/upstream'

author Stephen Rothwell <sfr@canb.auug.org.au>

Sun, 7 Oct 2012 23:00:53 +0000 (10:00 +1100)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Sun, 7 Oct 2012 23:00:53 +0000 (10:00 +1100)
author Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:00:53 +0000 (10:00 +1100)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:00:53 +0000 (10:00 +1100)
diff --cc arch/arm64/include/asm/unistd32.h

index 3ba1f1a906296cf4e355ba73e9464da37b53d69c,ec61180a2028c43035bf2843262734bbde696ef5..ba42d41fc5c2398a97d5a0647067584a987cdc6b
--- 1/arch/arm64/include/asm/unistd32.h
--- 2/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
@@@ -752,3 -754,6 +752,4 @@@ __SYSCALL(__NR_syncfs, sys_syncfs
   #define __ARCH_WANT_SYS_SIGPENDING
   #define __ARCH_WANT_SYS_SIGPROCMASK
   #define __ARCH_WANT_COMPAT_SYS_RT_SIGSUSPEND
- -
- -#endif /* __ASM_UNISTD32_H */
+ #define __ARCH_WANT_COMPAT_SYS_SENDFILE
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 7 Oct 2012 23:00:53 +0000 (10:00 +1100)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sun, 7 Oct 2012 23:00:53 +0000 (10:00 +1100)