patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / include / asm-ia64 / unistd.h

diff --git a/include/asm-ia64/unistd.h b/include/asm-ia64/unistd.h
index 284c40a..ca3c7b9 100644 (file)
--- a/include/asm-ia64/unistd.h
+++ b/include/asm-ia64/unistd.h
@@ -4,7 +4,7 @@
 /*
  * IA-64 Linux syscall numbers and inline-functions.
  *
- * Copyright (C) 1998-2003 Hewlett-Packard Co
+ * Copyright (C) 1998-2004 Hewlett-Packard Co
  *     David Mosberger-Tang <davidm@hpl.hp.com>
  */
 
@@ -248,20 +248,36 @@
 #define __NR_clock_nanosleep           1256
 #define __NR_fstatfs64                 1257
 #define __NR_statfs64                  1258
-#define __NR_reserved1                 1259    /* reserved for NUMA interface */
-#define __NR_reserved2                 1260    /* reserved for NUMA interface */
-#define __NR_reserved3                 1261    /* reserved for NUMA interface */
+#define __NR_mbind                     1259
+#define __NR_get_mempolicy             1260
+#define __NR_set_mempolicy             1261
 #define __NR_mq_open                   1262
 #define __NR_mq_unlink                 1263
 #define __NR_mq_timedsend              1264
 #define __NR_mq_timedreceive           1265
 #define __NR_mq_notify                 1266
 #define __NR_mq_getsetattr             1267
+#define __NR_kexec_load                        1268
+#define __NR_vserver                   1269
 
 #ifdef __KERNEL__
 
+#include <linux/config.h>
+
 #define NR_syscalls                    256 /* length of syscall table */
 
+#ifdef CONFIG_IA32_SUPPORT
+# define __ARCH_WANT_SYS_FADVISE64
+# define __ARCH_WANT_SYS_GETPGRP
+# define __ARCH_WANT_SYS_LLSEEK
+# define __ARCH_WANT_SYS_NICE
+# define __ARCH_WANT_SYS_OLD_GETRLIMIT
+# define __ARCH_WANT_SYS_OLDUMOUNT
+# define __ARCH_WANT_SYS_SIGPENDING
+# define __ARCH_WANT_SYS_SIGPROCMASK
+# define __ARCH_WANT_SYS_RT_SIGACTION
+#endif
+
 #if !defined(__ASSEMBLY__) && !defined(ASSEMBLER)
 
 #include <linux/types.h>
@@ -303,10 +319,10 @@ lseek (int fd, off_t off, int whence)
        return sys_lseek(fd, off, whence);
 }
 
-static inline long
+static inline void
 _exit (int value)
 {
-       return sys_exit(value);
+       sys_exit(value);
 }
 
 #define exit(x) _exit(x)
@@ -372,7 +388,7 @@ asmlinkage long sys_rt_sigaction(int sig,
  * proper prototype, but we can't use __typeof__ either, because not all cond_syscall()
  * declarations have prototypes at the moment.
  */
-#define cond_syscall(x) asmlinkage long x() __attribute__((weak,alias("sys_ni_syscall")));
+#define cond_syscall(x) asmlinkage long x (void) __attribute__((weak,alias("sys_ni_syscall")));
 
 #endif /* !__ASSEMBLY__ */
 #endif /* __KERNEL__ */