1 files changed, 6 insertions, 33 deletions
diff --git a/arch/um/include/asm/syscall-generic.h b/arch/um/include/asm/syscall-generic.h
index 25d00acd1322..98e50c50c12e 100644
--- a/arch/um/include/asm/syscall-generic.h
+++ b/arch/um/include/asm/syscall-generic.h
@@ -67,43 +67,16 @@ static inline void syscall_get_arguments(struct task_struct *task,
 static inline void syscall_set_arguments(struct task_struct *task,
                                         struct pt_regs *regs,
-                                         unsigned int i, unsigned int n,
                                         const unsigned long *args)
 {
        struct uml_pt_regs *r = &regs->regs;
-        switch (i) {
+        UPT_SYSCALL_ARG1(r) = *args++;
-        case 0:
+        UPT_SYSCALL_ARG2(r) = *args++;
-                if (!n--)
+        UPT_SYSCALL_ARG3(r) = *args++;
-                        break;
+        UPT_SYSCALL_ARG4(r) = *args++;
-                UPT_SYSCALL_ARG1(r) = *args++;
+        UPT_SYSCALL_ARG5(r) = *args++;
-        case 1:
+        UPT_SYSCALL_ARG6(r) = *args;
-                if (!n--)
-                        break;
-                UPT_SYSCALL_ARG2(r) = *args++;
-        case 2:
-                if (!n--)
-                        break;
-                UPT_SYSCALL_ARG3(r) = *args++;
-        case 3:
-                if (!n--)
-                        break;
-                UPT_SYSCALL_ARG4(r) = *args++;
-        case 4:
-                if (!n--)
-                        break;
-                UPT_SYSCALL_ARG5(r) = *args++;
-        case 5:
-                if (!n--)
-                        break;
-                UPT_SYSCALL_ARG6(r) = *args++;
-        case 6:
-                if (!n--)
-                        break;
-        default:
-                BUG();
-                break;
-        }
 }
 /* See arch/x86/um/asm/syscall.h for syscall_get_arch() definition. */

diff --git a/arch/um/include/asm/syscall-generic.h b/arch/um/include/asm/syscall-generic.h index 25d00acd1322..98e50c50c12e 100644 --- a/arch/um/include/asm/syscall-generic.h +++ b/arch/um/include/asm/syscall-generic.h
@@ -67,43 +67,16 @@ static inline void syscall_get_arguments(struct task_struct *task,
67		67
68	static inline void syscall_set_arguments(struct task_struct *task,	68	static inline void syscall_set_arguments(struct task_struct *task,
69	struct pt_regs *regs,	69	struct pt_regs *regs,
70	unsigned int i, unsigned int n,
71	const unsigned long *args)	70	const unsigned long *args)
72	{	71	{
73	struct uml_pt_regs *r = &regs->regs;	72	struct uml_pt_regs *r = &regs->regs;
74		73
75	switch (i) {	74	UPT_SYSCALL_ARG1(r) = *args++;
76	case 0:	75	UPT_SYSCALL_ARG2(r) = *args++;
77	if (!n--)	76	UPT_SYSCALL_ARG3(r) = *args++;
78	break;	77	UPT_SYSCALL_ARG4(r) = *args++;
79	UPT_SYSCALL_ARG1(r) = *args++;	78	UPT_SYSCALL_ARG5(r) = *args++;
80	case 1:	79	UPT_SYSCALL_ARG6(r) = *args;
81	if (!n--)
82	break;
83	UPT_SYSCALL_ARG2(r) = *args++;
84	case 2:
85	if (!n--)
86	break;
87	UPT_SYSCALL_ARG3(r) = *args++;
88	case 3:
89	if (!n--)
90	break;
91	UPT_SYSCALL_ARG4(r) = *args++;
92	case 4:
93	if (!n--)
94	break;
95	UPT_SYSCALL_ARG5(r) = *args++;
96	case 5:
97	if (!n--)
98	break;
99	UPT_SYSCALL_ARG6(r) = *args++;
100	case 6:
101	if (!n--)
102	break;
103	default:
104	BUG();
105	break;
106	}
107	}	80	}
108		81
109	/* See arch/x86/um/asm/syscall.h for syscall_get_arch() definition. */	82	/* See arch/x86/um/asm/syscall.h for syscall_get_arch() definition. */