aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/signal_32.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-02-08 15:10:02 -0500
committerIngo Molnar <mingo@elte.hu>2008-04-17 11:40:46 -0400
commit866bc13fc4c625186dd01429c68c5cf708f1cfd5 (patch)
treeef86e4dc1c67bee46b01273b5c0e46431d056004 /arch/x86/kernel/signal_32.c
parent123a63476cafcede1c70529f62a5bfb96a0efc1b (diff)
x86: Unify argument names in signal_32|64.c
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com> Cc: Roland McGrath <roland@redhat.com> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/signal_32.c')
-rw-r--r--arch/x86/kernel/signal_32.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index 5447fa5ec52c..add9c6e9c44d 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -107,9 +107,9 @@ sys_sigaltstack(unsigned long bx)
107/* 107/*
108 * Do a signal return; undo the signal stack. 108 * Do a signal return; undo the signal stack.
109 */ 109 */
110
111static int 110static int
112restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *peax) 111restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc,
112 unsigned long *pax)
113{ 113{
114 unsigned int err = 0; 114 unsigned int err = 0;
115 115
@@ -165,19 +165,19 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *peax
165 } 165 }
166 } 166 }
167 167
168 err |= __get_user(*peax, &sc->ax); 168 err |= __get_user(*pax, &sc->ax);
169 return err; 169 return err;
170 170
171badframe: 171badframe:
172 return 1; 172 return 1;
173} 173}
174 174
175asmlinkage int sys_sigreturn(unsigned long __unused) 175asmlinkage unsigned long sys_sigreturn(unsigned long __unused)
176{ 176{
177 struct pt_regs *regs = (struct pt_regs *) &__unused; 177 struct pt_regs *regs = (struct pt_regs *) &__unused;
178 struct sigframe __user *frame = (struct sigframe __user *)(regs->sp - 8); 178 struct sigframe __user *frame = (struct sigframe __user *)(regs->sp - 8);
179 sigset_t set; 179 sigset_t set;
180 int ax; 180 unsigned long ax;
181 181
182 if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) 182 if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))
183 goto badframe; 183 goto badframe;
@@ -216,8 +216,8 @@ asmlinkage int sys_rt_sigreturn(unsigned long __unused)
216{ 216{
217 struct pt_regs *regs = (struct pt_regs *)&__unused; 217 struct pt_regs *regs = (struct pt_regs *)&__unused;
218 struct rt_sigframe __user *frame; 218 struct rt_sigframe __user *frame;
219 unsigned long ax;
219 sigset_t set; 220 sigset_t set;
220 int ax;
221 221
222 frame = (struct rt_sigframe __user *)(regs->sp - sizeof(long)); 222 frame = (struct rt_sigframe __user *)(regs->sp - sizeof(long));
223 if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) 223 if (!access_ok(VERIFY_READ, frame, sizeof(*frame)))