audit: x86: drop arch from __audit_syscall_entry() interface

Since the arch is found locally in __audit_syscall_entry(), there is no need to
pass it in as a parameter.  Delete it from the parameter list.

x86* was the only arch to call __audit_syscall_entry() directly and did so from
assembly code.

Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
Cc: linux-kernel@vger.kernel.org
Cc: linux-audit@redhat.com
Signed-off-by: Eric Paris <eparis@redhat.com>

---

As this patch relies on changes in the audit tree, I think it
appropriate to send it through my tree rather than the x86 tree.

1 files changed, 6 insertions, 6 deletions

diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 4299eb05023c..f5bdd2881815 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -186,12 +186,12 @@ sysexit_from_sys_call:
 
 #ifdef CONFIG_AUDITSYSCALL
         .macro auditsys_entry_common
-        movl %esi,%r9d                  /* 6th arg: 4th syscall arg */
-        movl %edx,%r8d                  /* 5th arg: 3rd syscall arg */
-        /* (already in %ecx)               4th arg: 2nd syscall arg */
-        movl %ebx,%edx                  /* 3rd arg: 1st syscall arg */
-        movl %eax,%esi                  /* 2nd arg: syscall number */
-        movl $AUDIT_ARCH_I386,%edi      /* 1st arg: audit arch */
+        movl %esi,%r8d                  /* 5th arg: 4th syscall arg */
+        movl %ecx,%r9d                  /*swap with edx*/
+        movl %edx,%ecx                  /* 4th arg: 3rd syscall arg */
+        movl %r9d,%edx                  /* 3rd arg: 2nd syscall arg */
+        movl %ebx,%esi                  /* 2nd arg: 1st syscall arg */
+        movl %eax,%edi                  /* 1st arg: syscall number */
         call __audit_syscall_entry
         movl RAX-ARGOFFSET(%rsp),%eax   /* reload syscall number */
         cmpq $(IA32_NR_syscalls-1),%rax