Merge branch 'for-linus' of git://oss.sgi.com:8090/xfs/xfs-2.6

[linux-2.6-omap-h63xx.git] / include / asm-avr32 / unistd.h

diff --git a/include/asm-avr32/unistd.h b/include/asm-avr32/unistd.h
index 3b4e35b55c822299072a04496ef11c70ea82fa13..89861a27543ec58554f9ad957b84801a80885595 100644 (file)
--- a/include/asm-avr32/unistd.h
+++ b/include/asm-avr32/unistd.h
@@ -297,12 +297,25 @@
 
 #define __NR_utimensat         278
 #define __NR_signalfd          279
-#define __NR_timerfd           280
+/* 280 was __NR_timerfd */
 #define __NR_eventfd           281
 
 #ifdef __KERNEL__
 #define NR_syscalls            282
 
+/* Old stuff */
+#define __IGNORE_uselib
+#define __IGNORE_mmap
+
+/* NUMA stuff */
+#define __IGNORE_mbind
+#define __IGNORE_get_mempolicy
+#define __IGNORE_set_mempolicy
+#define __IGNORE_migrate_pages
+#define __IGNORE_move_pages
+
+/* SMP stuff */
+#define __IGNORE_getcpu
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_STAT64