Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

1 files changed, 0 insertions, 142 deletions

diff --git a/include/asm-sh64/unistd.h b/include/asm-sh64/unistd.h
index ee7828b27ad1..1f38a7aacaaf 100644
--- a/include/asm-sh64/unistd.h
+++ b/include/asm-sh64/unistd.h
@@ -347,148 +347,6 @@
 #ifdef __KERNEL__ 
 
 #define NR_syscalls 321
-#include <linux/err.h>
-
-/* user-visible error numbers are in the range -1 - -MAX_ERRNO:
- * see <asm-sh64/errno.h> */
-
-#define __syscall_return(type, res) \
-do { \
-        /* Note: when returning from kernel the return value is in r9       \
-        **       This prevents conflicts between return value and arg1      \
-        **       when dispatching signal handler, in other words makes      \
-        **       life easier in the system call epilogue (see entry.S)      \
-        */                                                                  \
-        register unsigned long __sr2 __asm__ ("r2") = res;                  \
-        if ((unsigned long)(res) >= (unsigned long)(-MAX_ERRNO)) {          \
-                errno = -(res);                                             \
-                __sr2 = -1;                                                 \
-        } \
-        return (type) (__sr2);                                              \
-} while (0)
-
-/* XXX - _foo needs to be __foo, while __NR_bar could be _NR_bar. */
-
-#define _syscall0(type,name) \
-type name(void) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x10 << 16) | __NR_##name); \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "()"                      \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0) );                                                    \
-__syscall_return(type,__sc0);                                               \
-}
-
-        /*
-         * The apparent spurious "dummy" assembler comment is *needed*,
-         * as without it, the compiler treats the arg<n> variables
-         * as no longer live just before the asm. The compiler can
-         * then optimize the storage into any registers it wishes.
-         * The additional dummy statement forces the compiler to put
-         * the arguments into the correct registers before the TRAPA.
-         */
-#define _syscall1(type,name,type1,arg1) \
-type name(type1 arg1) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x11 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2)"                    \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2));                                        \
-__asm__ __volatile__ ("!dummy   %0 %1"                                      \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2));                                        \
-__syscall_return(type,__sc0);                                               \
-}
-
-#define _syscall2(type,name,type1,arg1,type2,arg2) \
-type name(type1 arg1,type2 arg2) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x12 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2,%3)"                 \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3) );                          \
-__asm__ __volatile__ ("!dummy   %0 %1 %2"                                   \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3) );                          \
-__syscall_return(type,__sc0);                                               \
-}
-
-#define _syscall3(type,name,type1,arg1,type2,arg2,type3,arg3) \
-type name(type1 arg1,type2 arg2,type3 arg3) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x13 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;         \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2,%3,%4)"              \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4) );             \
-__asm__ __volatile__ ("!dummy   %0 %1 %2 %3"                                \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4) );             \
-__syscall_return(type,__sc0);                                               \
-}
-
-#define _syscall4(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x14 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;         \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;         \
-register unsigned long __sc5 __asm__ ("r5") = (unsigned long) arg4;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2,%3,%4,%5)"           \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5) );\
-__asm__ __volatile__ ("!dummy   %0 %1 %2 %3 %4"                             \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5) );\
-__syscall_return(type,__sc0);                                               \
-}
-
-#define _syscall5(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x15 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;         \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;         \
-register unsigned long __sc5 __asm__ ("r5") = (unsigned long) arg4;         \
-register unsigned long __sc6 __asm__ ("r6") = (unsigned long) arg5;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2,%3,%4,%5,%6)"        \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-          "r" (__sc6));                                                     \
-__asm__ __volatile__ ("!dummy   %0 %1 %2 %3 %4 %5"                          \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-          "r" (__sc6));                                                     \
-__syscall_return(type,__sc0);                                               \
-}
-
-#define _syscall6(type,name,type1,arg1,type2,arg2,type3,arg3,type4,arg4,type5,arg5, type6, arg6) \
-type name (type1 arg1, type2 arg2, type3 arg3, type4 arg4, type5 arg5, type6 arg6) \
-{ \
-register unsigned long __sc0 __asm__ ("r9") = ((0x16 << 16) | __NR_##name); \
-register unsigned long __sc2 __asm__ ("r2") = (unsigned long) arg1;         \
-register unsigned long __sc3 __asm__ ("r3") = (unsigned long) arg2;         \
-register unsigned long __sc4 __asm__ ("r4") = (unsigned long) arg3;         \
-register unsigned long __sc5 __asm__ ("r5") = (unsigned long) arg4;         \
-register unsigned long __sc6 __asm__ ("r6") = (unsigned long) arg5;         \
-register unsigned long __sc7 __asm__ ("r7") = (unsigned long) arg6;         \
-__asm__ __volatile__ ("trapa    %1 !\t\t\t" #name "(%2,%3,%4,%5,%6,%7)"     \
-        : "=r" (__sc0)                                                      \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-          "r" (__sc6), "r" (__sc7));                                        \
-__asm__ __volatile__ ("!dummy   %0 %1 %2 %3 %4 %5 %6"                       \
-        :                                                                   \
-        : "r" (__sc0), "r" (__sc2), "r" (__sc3), "r" (__sc4), "r" (__sc5),  \
-          "r" (__sc6), "r" (__sc7));                                        \
-__syscall_return(type,__sc0);                                               \
-}
 
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR