[PATCH 8/9] x86: Unify argument names in signal_32|64.c

[Harvey Harrison]

prax/peax becomes pax.  Change from int to unsigned long in X86_32.

Signed-off-by: Harvey Harrison <[EMAIL PROTECTED]>
---
 arch/x86/kernel/signal_32.c |    9 ++++-----
 arch/x86/kernel/signal_64.c |    4 ++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index 858a71f..5f30627 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -108,9 +108,8 @@ sys_sigaltstack(unsigned long bx)
 /*
  * Do a signal return; undo the signal stack.
  */
-
 static int
-restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int 
*peax)
+restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, 
unsigned long *pax)
 {
        unsigned int err = 0;
 
@@ -166,19 +165,19 @@ restore_sigcontext(struct pt_regs *regs, struct 
sigcontext __user *sc, int *peax
                }
        }
 
-       err |= __get_user(*peax, &sc->ax);
+       err |= __get_user(*pax, &sc->ax);
        return err;
 
 badframe:
        return 1;
 }
 
-asmlinkage int sys_sigreturn(unsigned long __unused)
+asmlinkage unsigned long sys_sigreturn(unsigned long __unused)
 {
        struct pt_regs *regs = (struct pt_regs *) &__unused;
        struct sigframe __user *frame = (struct sigframe __user *)(regs->sp - 
8);
        sigset_t set;
-       int ax;
+       unsigned long ax;
 
        if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
                goto badframe;
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index f006ea1..40b30cd 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -61,7 +61,7 @@ sys_sigaltstack(const stack_t __user *uss, stack_t __user 
*uoss,
  * Do a signal return; undo the signal stack.
  */
 static int
-restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, 
unsigned long *prax)
+restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, 
unsigned long *pax)
 {
        unsigned int err = 0;
 
@@ -114,7 +114,7 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext 
__user *sc, unsigned
                }
        }
 
-       err |= __get_user(*prax, &sc->ax);
+       err |= __get_user(*pax, &sc->ax);
        return err;
 
 badframe:
-- 
1.5.4.1219.g65b9


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/