Pull rmia32 into release branch

1 files changed, 0 insertions, 81 deletions

diff --git a/arch/ia64/include/asm/syscall.h b/arch/ia64/include/asm/syscall.h
index 2f758a42f94b..a7ff1c6ab068 100644
--- a/arch/ia64/include/asm/syscall.h
+++ b/arch/ia64/include/asm/syscall.h
@@ -22,33 +22,18 @@ static inline long syscall_get_nr(struct task_struct *task,
         if ((long)regs->cr_ifs < 0) /* Not a syscall */
                 return -1;
 
-#ifdef CONFIG_IA32_SUPPORT
-        if (IS_IA32_PROCESS(regs))
-                return regs->r1;
-#endif
-
         return regs->r15;
 }
 
 static inline void syscall_rollback(struct task_struct *task,
                                     struct pt_regs *regs)
 {
-#ifdef CONFIG_IA32_SUPPORT
-        if (IS_IA32_PROCESS(regs))
-                regs->r8 = regs->r1;
-#endif
-
         /* do nothing */
 }
 
 static inline long syscall_get_error(struct task_struct *task,
                                      struct pt_regs *regs)
 {
-#ifdef CONFIG_IA32_SUPPORT
-        if (IS_IA32_PROCESS(regs))
-                return regs->r8;
-#endif
-
         return regs->r10 == -1 ? regs->r8:0;
 }
 
@@ -62,13 +47,6 @@ static inline void syscall_set_return_value(struct task_struct *task,
                                             struct pt_regs *regs,
                                             int error, long val)
 {
-#ifdef CONFIG_IA32_SUPPORT
-        if (IS_IA32_PROCESS(regs)) {
-                regs->r8 = (long) error ? error : val;
-                return;
-        }
-#endif
-
         if (error) {
                 /* error < 0, but ia64 uses > 0 return value */
                 regs->r8 = -error;
@@ -89,37 +67,6 @@ static inline void syscall_get_arguments(struct task_struct *task,
 {
         BUG_ON(i + n > 6);
 
-#ifdef CONFIG_IA32_SUPPORT
-        if (IS_IA32_PROCESS(regs)) {
-                switch (i + n) {
-                case 6:
-                        if (!n--) break;
-                        *args++ = regs->r13;
-                case 5:
-                        if (!n--) break;
-                        *args++ = regs->r15;
-                case 4:
-                        if (!n--) break;
-                        *args++ = regs->r14;
-                case 3:
-                        if (!n--) break;
-                        *args++ = regs->r10;
-                case 2:
-                        if (!n--) break;
-                        *args++ = regs->r9;
-                case 1:
-                        if (!n--) break;
-                        *args++ = regs->r11;
-                case 0:
-                        if (!n--) break;
-                default:
-                        BUG();
-                        break;
-                }
-
-                return;
-        }
-#endif
         ia64_syscall_get_set_arguments(task, regs, i, n, args, 0);
 }
 
@@ -130,34 +77,6 @@ static inline void syscall_set_arguments(struct task_struct *task,
 {
         BUG_ON(i + n > 6);
 
-#ifdef CONFIG_IA32_SUPPORT
-        if (IS_IA32_PROCESS(regs)) {
-                switch (i + n) {
-                case 6:
-                        if (!n--) break;
-                        regs->r13 = *args++;
-                case 5:
-                        if (!n--) break;
-                        regs->r15 = *args++;
-                case 4:
-                        if (!n--) break;
-                        regs->r14 = *args++;
-                case 3:
-                        if (!n--) break;
-                        regs->r10 = *args++;
-                case 2:
-                        if (!n--) break;
-                        regs->r9 = *args++;
-                case 1:
-                        if (!n--) break;
-                        regs->r11 = *args++;
-                case 0:
-                        if (!n--) break;
-                }
-
-                return;
-        }
-#endif
         ia64_syscall_get_set_arguments(task, regs, i, n, args, 1);
 }
 #endif  /* _ASM_SYSCALL_H */