git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'acpi-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
include
/
asm
/
unistd.h
diff --git
a/arch/arm/include/asm/unistd.h
b/arch/arm/include/asm/unistd.h
index 88ef2ce1f69a151b70d7e6dc621cbf1089495fbb..7a39e77984eff49b0d4209eaeba93b0c9f8a48dd 100644
(file)
--- a/
arch/arm/include/asm/unistd.h
+++ b/
arch/arm/include/asm/unistd.h
@@
-26,10
+26,10
@@
#define __ARCH_WANT_SYS_SIGPROCMASK
#define __ARCH_WANT_SYS_OLD_MMAP
#define __ARCH_WANT_SYS_OLD_SELECT
#define __ARCH_WANT_SYS_SIGPROCMASK
#define __ARCH_WANT_SYS_OLD_MMAP
#define __ARCH_WANT_SYS_OLD_SELECT
-#define __ARCH_WANT_SYS_UTIME
+#define __ARCH_WANT_SYS_UTIME
32
#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
#if !defined(CONFIG_AEABI) || defined(CONFIG_OABI_COMPAT)
-#define __ARCH_WANT_SYS_TIME
+#define __ARCH_WANT_SYS_TIME
32
#define __ARCH_WANT_SYS_IPC
#define __ARCH_WANT_SYS_OLDUMOUNT
#define __ARCH_WANT_SYS_ALARM
#define __ARCH_WANT_SYS_IPC
#define __ARCH_WANT_SYS_OLDUMOUNT
#define __ARCH_WANT_SYS_ALARM
@@
-45,7
+45,6
@@
* Unimplemented (or alternatively implemented) syscalls
*/
#define __IGNORE_fadvise64_64
* Unimplemented (or alternatively implemented) syscalls
*/
#define __IGNORE_fadvise64_64
-#define __IGNORE_migrate_pages
#ifdef __ARM_EABI__
/*
#ifdef __ARM_EABI__
/*