diff options
author | Michal Simek <monstr@monstr.eu> | 2009-12-11 06:54:04 -0500 |
---|---|---|
committer | Michal Simek <monstr@monstr.eu> | 2009-12-14 02:45:12 -0500 |
commit | 571202f50fad0aeb36661c79de9beed052347df8 (patch) | |
tree | b66d621652e0bbaf07823edac0ea701d1114cb8e | |
parent | 825c9a359ecd6ba2569e6c38199e7d072ab388e3 (diff) |
microblaze: Remove rt_sigsuspend wrapper
Generic rt_sigsuspend syscalls doesn't need any asm wrapper.
Signed-off-by: Michal Simek <monstr@monstr.eu>
-rw-r--r-- | arch/microblaze/kernel/entry.S | 11 | ||||
-rw-r--r-- | arch/microblaze/kernel/signal.c | 1 | ||||
-rw-r--r-- | arch/microblaze/kernel/syscall_table.S | 2 |
3 files changed, 1 insertions, 13 deletions
diff --git a/arch/microblaze/kernel/entry.S b/arch/microblaze/kernel/entry.S index b061d98a3218..3bad4ff49471 100644 --- a/arch/microblaze/kernel/entry.S +++ b/arch/microblaze/kernel/entry.S | |||
@@ -500,17 +500,6 @@ C_ENTRY(sys_execve): | |||
500 | brid microblaze_execve; /* Do real work (tail-call).*/ | 500 | brid microblaze_execve; /* Do real work (tail-call).*/ |
501 | nop; | 501 | nop; |
502 | 502 | ||
503 | C_ENTRY(sys_rt_sigsuspend_wrapper): | ||
504 | swi r3, r1, PTO+PT_R3; /* restore saved r3, r4 registers */ | ||
505 | swi r4, r1, PTO+PT_R4; | ||
506 | la r7, r1, PTO; /* add user context as 3rd arg */ | ||
507 | brlid r15, sys_rt_sigsuspend; /* Do real work.*/ | ||
508 | nop; | ||
509 | lwi r3, r1, PTO+PT_R3; /* restore saved r3, r4 registers */ | ||
510 | lwi r4, r1, PTO+PT_R4; | ||
511 | bri ret_from_trap /* fall through will not work here due to align */ | ||
512 | nop; | ||
513 | |||
514 | C_ENTRY(sys_rt_sigreturn_wrapper): | 503 | C_ENTRY(sys_rt_sigreturn_wrapper): |
515 | swi r3, r1, PTO+PT_R3; /* restore saved r3, r4 registers */ | 504 | swi r3, r1, PTO+PT_R3; /* restore saved r3, r4 registers */ |
516 | swi r4, r1, PTO+PT_R4; | 505 | swi r4, r1, PTO+PT_R4; |
diff --git a/arch/microblaze/kernel/signal.c b/arch/microblaze/kernel/signal.c index 6de3db04b1a4..d8d3bb396cd6 100644 --- a/arch/microblaze/kernel/signal.c +++ b/arch/microblaze/kernel/signal.c | |||
@@ -44,7 +44,6 @@ | |||
44 | 44 | ||
45 | asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset, int in_sycall); | 45 | asmlinkage int do_signal(struct pt_regs *regs, sigset_t *oldset, int in_sycall); |
46 | 46 | ||
47 | |||
48 | asmlinkage long | 47 | asmlinkage long |
49 | sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, | 48 | sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, |
50 | struct pt_regs *regs) | 49 | struct pt_regs *regs) |
diff --git a/arch/microblaze/kernel/syscall_table.S b/arch/microblaze/kernel/syscall_table.S index 4e666d9c1261..4088be7d4e29 100644 --- a/arch/microblaze/kernel/syscall_table.S +++ b/arch/microblaze/kernel/syscall_table.S | |||
@@ -183,7 +183,7 @@ ENTRY(sys_call_table) | |||
183 | .long sys_rt_sigpending | 183 | .long sys_rt_sigpending |
184 | .long sys_rt_sigtimedwait | 184 | .long sys_rt_sigtimedwait |
185 | .long sys_rt_sigqueueinfo | 185 | .long sys_rt_sigqueueinfo |
186 | .long sys_rt_sigsuspend_wrapper | 186 | .long sys_rt_sigsuspend |
187 | .long sys_pread64 /* 180 */ | 187 | .long sys_pread64 /* 180 */ |
188 | .long sys_pwrite64 | 188 | .long sys_pwrite64 |
189 | .long sys_chown | 189 | .long sys_chown |