aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel
diff options
context:
space:
mode:
authorHiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>2008-11-21 20:38:57 -0500
committerIngo Molnar <mingo@elte.hu>2008-11-23 04:50:59 -0500
commit2456d738ef051f85170bf018faef63f83fa84eb5 (patch)
treed71c94c7a6571de396b984d5205a579196bd5c69 /arch/x86/kernel
parent666ac7be049ec290625e65d5922ff59f7bdec527 (diff)
x86: signal: cosmetic unification of sys_rt_sigreturn()
Impact: cleanup Add #ifdef directive for unification. Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel')
-rw-r--r--arch/x86/kernel/signal_32.c7
-rw-r--r--arch/x86/kernel/signal_64.c9
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/x86/kernel/signal_32.c b/arch/x86/kernel/signal_32.c
index d9909881ac66..f7dd6c44c042 100644
--- a/arch/x86/kernel/signal_32.c
+++ b/arch/x86/kernel/signal_32.c
@@ -299,12 +299,19 @@ badframe:
299 return 0; 299 return 0;
300} 300}
301 301
302#ifdef CONFIG_X86_32
302asmlinkage int sys_rt_sigreturn(unsigned long __unused) 303asmlinkage int sys_rt_sigreturn(unsigned long __unused)
303{ 304{
304 struct pt_regs *regs = (struct pt_regs *)&__unused; 305 struct pt_regs *regs = (struct pt_regs *)&__unused;
305 306
306 return do_rt_sigreturn(regs); 307 return do_rt_sigreturn(regs);
307} 308}
309#else /* !CONFIG_X86_32 */
310asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
311{
312 return do_rt_sigreturn(regs);
313}
314#endif /* CONFIG_X86_32 */
308 315
309/* 316/*
310 * Set up a signal frame. 317 * Set up a signal frame.
diff --git a/arch/x86/kernel/signal_64.c b/arch/x86/kernel/signal_64.c
index b6e4fe03a36b..32718f5e4f61 100644
--- a/arch/x86/kernel/signal_64.c
+++ b/arch/x86/kernel/signal_64.c
@@ -169,10 +169,19 @@ badframe:
169 return 0; 169 return 0;
170} 170}
171 171
172#ifdef CONFIG_X86_32
173asmlinkage int sys_rt_sigreturn(unsigned long __unused)
174{
175 struct pt_regs *regs = (struct pt_regs *)&__unused;
176
177 return do_rt_sigreturn(regs);
178}
179#else /* !CONFIG_X86_32 */
172asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) 180asmlinkage long sys_rt_sigreturn(struct pt_regs *regs)
173{ 181{
174 return do_rt_sigreturn(regs); 182 return do_rt_sigreturn(regs);
175} 183}
184#endif /* CONFIG_X86_32 */
176 185
177/* 186/*
178 * Set up a signal frame. 187 * Set up a signal frame.