diff options
author | Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com> | 2008-12-17 21:51:46 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-18 05:28:55 -0500 |
commit | 3b0d29ee1c73b6b90bfddd10f7b8e86632b6b694 (patch) | |
tree | 5e8b0f3564d1f2033f3602d8cd130709442662eb /arch/x86/ia32 | |
parent | c85c2ff877c9305f801f7d5b9e6382cb05a03d45 (diff) |
x86: ia32_signal: rename struct sigframe and rt_sigframe
Impact: cleanup, prepare to include sigframe.h
Rename struct sigframe to struct sigframe_ia32 and struct rt_sigframe to
struct rt_sigframe_ia32.
Signed-off-by: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/ia32')
-rw-r--r-- | arch/x86/ia32/ia32_signal.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c index 9c99c429a20d..334a4aa2e75b 100644 --- a/arch/x86/ia32/ia32_signal.c +++ b/arch/x86/ia32/ia32_signal.c | |||
@@ -174,7 +174,7 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr, | |||
174 | * Do a signal return; undo the signal stack. | 174 | * Do a signal return; undo the signal stack. |
175 | */ | 175 | */ |
176 | 176 | ||
177 | struct sigframe | 177 | struct sigframe_ia32 |
178 | { | 178 | { |
179 | u32 pretcode; | 179 | u32 pretcode; |
180 | int sig; | 180 | int sig; |
@@ -185,7 +185,7 @@ struct sigframe | |||
185 | /* fp state follows here */ | 185 | /* fp state follows here */ |
186 | }; | 186 | }; |
187 | 187 | ||
188 | struct rt_sigframe | 188 | struct rt_sigframe_ia32 |
189 | { | 189 | { |
190 | u32 pretcode; | 190 | u32 pretcode; |
191 | int sig; | 191 | int sig; |
@@ -271,7 +271,7 @@ static int ia32_restore_sigcontext(struct pt_regs *regs, | |||
271 | 271 | ||
272 | asmlinkage long sys32_sigreturn(struct pt_regs *regs) | 272 | asmlinkage long sys32_sigreturn(struct pt_regs *regs) |
273 | { | 273 | { |
274 | struct sigframe __user *frame = (struct sigframe __user *)(regs->sp-8); | 274 | struct sigframe_ia32 __user *frame = (struct sigframe_ia32 __user *)(regs->sp-8); |
275 | sigset_t set; | 275 | sigset_t set; |
276 | unsigned int ax; | 276 | unsigned int ax; |
277 | 277 | ||
@@ -301,12 +301,12 @@ badframe: | |||
301 | 301 | ||
302 | asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs) | 302 | asmlinkage long sys32_rt_sigreturn(struct pt_regs *regs) |
303 | { | 303 | { |
304 | struct rt_sigframe __user *frame; | 304 | struct rt_sigframe_ia32 __user *frame; |
305 | sigset_t set; | 305 | sigset_t set; |
306 | unsigned int ax; | 306 | unsigned int ax; |
307 | struct pt_regs tregs; | 307 | struct pt_regs tregs; |
308 | 308 | ||
309 | frame = (struct rt_sigframe __user *)(regs->sp - 4); | 309 | frame = (struct rt_sigframe_ia32 __user *)(regs->sp - 4); |
310 | 310 | ||
311 | if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) | 311 | if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) |
312 | goto badframe; | 312 | goto badframe; |
@@ -418,7 +418,7 @@ static void __user *get_sigframe(struct k_sigaction *ka, struct pt_regs *regs, | |||
418 | int ia32_setup_frame(int sig, struct k_sigaction *ka, | 418 | int ia32_setup_frame(int sig, struct k_sigaction *ka, |
419 | compat_sigset_t *set, struct pt_regs *regs) | 419 | compat_sigset_t *set, struct pt_regs *regs) |
420 | { | 420 | { |
421 | struct sigframe __user *frame; | 421 | struct sigframe_ia32 __user *frame; |
422 | void __user *restorer; | 422 | void __user *restorer; |
423 | int err = 0; | 423 | int err = 0; |
424 | void __user *fpstate = NULL; | 424 | void __user *fpstate = NULL; |
@@ -497,7 +497,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, | |||
497 | int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | 497 | int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, |
498 | compat_sigset_t *set, struct pt_regs *regs) | 498 | compat_sigset_t *set, struct pt_regs *regs) |
499 | { | 499 | { |
500 | struct rt_sigframe __user *frame; | 500 | struct rt_sigframe_ia32 __user *frame; |
501 | void __user *restorer; | 501 | void __user *restorer; |
502 | int err = 0; | 502 | int err = 0; |
503 | void __user *fpstate = NULL; | 503 | void __user *fpstate = NULL; |