Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / arch / x86 / include / asm / syscall.h

diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
index 04c47dc5597cf9f002408ca2590210b0477fa74b..d82f39bb7905e8f14d3cbd1dc0365ba98f03eea6 100644 (file)
--- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h
@@ -10,8 +10,8 @@
  * See asm-generic/syscall.h for descriptions of what we must do here.
  */
 
-#ifndef _ASM_SYSCALL_H
-#define _ASM_SYSCALL_H 1
+#ifndef _ASM_X86_SYSCALL_H
+#define _ASM_X86_SYSCALL_H
 
 #include <linux/sched.h>
 #include <linux/err.h>
@@ -93,26 +93,26 @@ static inline void syscall_get_arguments(struct task_struct *task,
 {
 # ifdef CONFIG_IA32_EMULATION
        if (task_thread_info(task)->status & TS_COMPAT)
-               switch (i + n) {
-               case 6:
+               switch (i) {
+               case 0:
                        if (!n--) break;
-                       *args++ = regs->bp;
-               case 5:
+                       *args++ = regs->bx;
+               case 1:
                        if (!n--) break;
-                       *args++ = regs->di;
-               case 4:
+                       *args++ = regs->cx;
+               case 2:
                        if (!n--) break;
-                       *args++ = regs->si;
+                       *args++ = regs->dx;
                case 3:
                        if (!n--) break;
-                       *args++ = regs->dx;
-               case 2:
+                       *args++ = regs->si;
+               case 4:
                        if (!n--) break;
-                       *args++ = regs->cx;
-               case 1:
+                       *args++ = regs->di;
+               case 5:
                        if (!n--) break;
-                       *args++ = regs->bx;
-               case 0:
+                       *args++ = regs->bp;
+               case 6:
                        if (!n--) break;
                default:
                        BUG();
@@ -120,26 +120,26 @@ static inline void syscall_get_arguments(struct task_struct *task,
                }
        else
 # endif
-               switch (i + n) {
-               case 6:
+               switch (i) {
+               case 0:
                        if (!n--) break;
-                       *args++ = regs->r9;
-               case 5:
+                       *args++ = regs->di;
+               case 1:
                        if (!n--) break;
-                       *args++ = regs->r8;
-               case 4:
+                       *args++ = regs->si;
+               case 2:
                        if (!n--) break;
-                       *args++ = regs->r10;
+                       *args++ = regs->dx;
                case 3:
                        if (!n--) break;
-                       *args++ = regs->dx;
-               case 2:
+                       *args++ = regs->r10;
+               case 4:
                        if (!n--) break;
-                       *args++ = regs->si;
-               case 1:
+                       *args++ = regs->r8;
+               case 5:
                        if (!n--) break;
-                       *args++ = regs->di;
-               case 0:
+                       *args++ = regs->r9;
+               case 6:
                        if (!n--) break;
                default:
                        BUG();
@@ -154,58 +154,60 @@ static inline void syscall_set_arguments(struct task_struct *task,
 {
 # ifdef CONFIG_IA32_EMULATION
        if (task_thread_info(task)->status & TS_COMPAT)
-               switch (i + n) {
-               case 6:
+               switch (i) {
+               case 0:
                        if (!n--) break;
-                       regs->bp = *args++;
-               case 5:
+                       regs->bx = *args++;
+               case 1:
                        if (!n--) break;
-                       regs->di = *args++;
-               case 4:
+                       regs->cx = *args++;
+               case 2:
                        if (!n--) break;
-                       regs->si = *args++;
+                       regs->dx = *args++;
                case 3:
                        if (!n--) break;
-                       regs->dx = *args++;
-               case 2:
+                       regs->si = *args++;
+               case 4:
                        if (!n--) break;
-                       regs->cx = *args++;
-               case 1:
+                       regs->di = *args++;
+               case 5:
                        if (!n--) break;
-                       regs->bx = *args++;
-               case 0:
+                       regs->bp = *args++;
+               case 6:
                        if (!n--) break;
                default:
                        BUG();
+                       break;
                }
        else
 # endif
-               switch (i + n) {
-               case 6:
+               switch (i) {
+               case 0:
                        if (!n--) break;
-                       regs->r9 = *args++;
-               case 5:
+                       regs->di = *args++;
+               case 1:
                        if (!n--) break;
-                       regs->r8 = *args++;
-               case 4:
+                       regs->si = *args++;
+               case 2:
                        if (!n--) break;
-                       regs->r10 = *args++;
+                       regs->dx = *args++;
                case 3:
                        if (!n--) break;
-                       regs->dx = *args++;
-               case 2:
+                       regs->r10 = *args++;
+               case 4:
                        if (!n--) break;
-                       regs->si = *args++;
-               case 1:
+                       regs->r8 = *args++;
+               case 5:
                        if (!n--) break;
-                       regs->di = *args++;
-               case 0:
+                       regs->r9 = *args++;
+               case 6:
                        if (!n--) break;
                default:
                        BUG();
+                       break;
                }
 }
 
 #endif /* CONFIG_X86_32 */
 
-#endif /* _ASM_SYSCALL_H */
+#endif /* _ASM_X86_SYSCALL_H */