Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for...

[mv-sheeva.git] / include / asm-m32r / unistd.h

diff --git a/include/asm-m32r/unistd.h b/include/asm-m32r/unistd.h
index ac399e1f7bc02b1d5d109185156a809c47d2c0e5..cc31790d8077c5dbc07e9c434ecf10d4f6a79870 100644 (file)
--- a/include/asm-m32r/unistd.h
+++ b/include/asm-m32r/unistd.h
@@ -292,9 +292,11 @@
 #define __NR_mq_timedreceive   (__NR_mq_open+3)
 #define __NR_mq_notify         (__NR_mq_open+4)
 #define __NR_mq_getsetattr     (__NR_mq_open+5)
-#define __NR_sys_kexec_load    283
+#define __NR_kexec_load                283
 #define __NR_waitid            284
 
+#ifdef __KERNEL__
+
 #define NR_syscalls 285
 
 /* user-visible error numbers are in the range -1 - -124: see
@@ -319,7 +321,7 @@ type name(void) \
 register long __scno __asm__ ("r7") = __NR_##name; \
 register long __res __asm__("r0"); \
 __asm__ __volatile__ (\
-       "trap #" SYSCALL_VECTOR \
+       "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno) \
        : "memory"); \
@@ -332,7 +334,7 @@ type name(type1 arg1) \
 register long __scno __asm__ ("r7") = __NR_##name; \
 register long __res __asm__ ("r0") = (long)(arg1); \
 __asm__ __volatile__ (\
-       "trap #" SYSCALL_VECTOR \
+       "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno), "0" (__res) \
        : "memory"); \
@@ -346,7 +348,7 @@ register long __scno __asm__ ("r7") = __NR_##name; \
 register long __arg2 __asm__ ("r1") = (long)(arg2); \
 register long __res __asm__ ("r0") = (long)(arg1); \
 __asm__ __volatile__ (\
-       "trap #" SYSCALL_VECTOR \
+       "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno), "0" (__res), "r" (__arg2) \
        : "memory"); \
@@ -361,7 +363,7 @@ register long __arg3 __asm__ ("r2") = (long)(arg3); \
 register long __arg2 __asm__ ("r1") = (long)(arg2); \
 register long __res __asm__ ("r0") = (long)(arg1); \
 __asm__ __volatile__ (\
-       "trap #" SYSCALL_VECTOR \
+       "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno), "0" (__res), "r" (__arg2), \
                "r" (__arg3) \
@@ -378,7 +380,7 @@ register long __arg3 __asm__ ("r2") = (long)(arg3); \
 register long __arg2 __asm__ ("r1") = (long)(arg2); \
 register long __res __asm__ ("r0") = (long)(arg1); \
 __asm__ __volatile__ (\
-       "trap #" SYSCALL_VECTOR \
+       "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno), "0" (__res), "r" (__arg2), \
                "r" (__arg3), "r" (__arg4) \
@@ -397,7 +399,7 @@ register long __arg3 __asm__ ("r2") = (long)(arg3); \
 register long __arg2 __asm__ ("r1") = (long)(arg2); \
 register long __res __asm__ ("r0") = (long)(arg1); \
 __asm__ __volatile__ (\
-       "trap #" SYSCALL_VECTOR \
+       "trap #" SYSCALL_VECTOR "|| nop"\
        : "=r" (__res) \
        : "r" (__scno), "0" (__res), "r" (__arg2), \
                "r" (__arg3), "r" (__arg4), "r" (__arg5) \
@@ -405,7 +407,6 @@ __asm__ __volatile__ (\
 __syscall_return(type,__res); \
 }
 
-#ifdef __KERNEL__
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_STAT64
 #define __ARCH_WANT_SYS_ALARM
@@ -421,7 +422,6 @@ __syscall_return(type,__res); \
 #define __ARCH_WANT_SYS_OLD_GETRLIMIT /*will be unused*/
 #define __ARCH_WANT_SYS_OLDUMOUNT
 #define __ARCH_WANT_SYS_RT_SIGACTION
-#endif
 
 #ifdef __KERNEL_SYSCALLS__
 
@@ -470,4 +470,5 @@ asmlinkage long sys_rt_sigaction(int sig,
 #define cond_syscall(x) asm(".weak\t" #x "\n\t.set\t" #x ",sys_ni_syscall")
 #endif
 
+#endif /* __KERNEL__ */
 #endif /* _ASM_M32R_UNISTD_H */