lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MIPS] Replace sys32_timer_create with the generic compat_sys_timer_create.

Browse Source 
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle
2007-02-27 01:21:17 +00:00
parent 08274cefdc
commit 821d313c25
3 changed files with 2 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
arch/mips/kernel/linux32.c
View File

@@ -544,37 +544,6 @@ asmlinkage long sys32_sync_file_range(int fd, int __pad,
flags); flags);
} }
struct sigevent32 {
u32 sigev_value;
u32 sigev_signo;
u32 sigev_notify;
u32 payload[(64 / 4) - 3];
};
extern asmlinkage long
sys_timer_create(clockid_t which_clock,
struct sigevent __user *timer_event_spec,
timer_t __user * created_timer_id);
long
sys32_timer_create(u32 clock, struct sigevent32 __user *se32, timer_t __user *timer_id)
{
struct sigevent __user *p = NULL;
if (se32) {
struct sigevent se;
p = compat_alloc_user_space(sizeof(struct sigevent));
memset(&se, 0, sizeof(struct sigevent));
if (get_user(se.sigev_value.sival_int, &se32->sigev_value) ||
__get_user(se.sigev_signo, &se32->sigev_signo) ||
__get_user(se.sigev_notify, &se32->sigev_notify) ||
__copy_from_user(&se._sigev_un._pad, &se32->payload,
sizeof(se32->payload)) ||
copy_to_user(p, &se, sizeof(se)))
return -EFAULT;
}
return sys_timer_create(clock, p, timer_id);
}
save_static_function(sys32_clone); save_static_function(sys32_clone);
__attribute_used__ noinline static int __attribute_used__ noinline static int
_sys32_clone(nabi_no_regargs struct pt_regs regs) _sys32_clone(nabi_no_regargs struct pt_regs regs)

2
arch/mips/kernel/scall64-n32.S
View File

@@ -340,7 +340,7 @@ EXPORT(sysn32_call_table)
PTR compat_sys_statfs64 PTR compat_sys_statfs64
PTR compat_sys_fstatfs64 PTR compat_sys_fstatfs64
PTR sys_sendfile64 PTR sys_sendfile64
PTR sys32_timer_create /* 6220 */ PTR compat_sys_timer_create /* 6220 */
PTR compat_sys_timer_settime PTR compat_sys_timer_settime
PTR compat_sys_timer_gettime PTR compat_sys_timer_gettime
PTR sys_timer_getoverrun PTR sys_timer_getoverrun

2
arch/mips/kernel/scall64-o32.S
View File

@@ -462,7 +462,7 @@ sys_call_table:
PTR sys_fadvise64_64 PTR sys_fadvise64_64
PTR compat_sys_statfs64 /* 4255 */ PTR compat_sys_statfs64 /* 4255 */
PTR compat_sys_fstatfs64 PTR compat_sys_fstatfs64
PTR sys32_timer_create PTR compat_sys_timer_create
PTR compat_sys_timer_settime PTR compat_sys_timer_settime
PTR compat_sys_timer_gettime PTR compat_sys_timer_gettime
PTR sys_timer_getoverrun /* 4260 */ PTR sys_timer_getoverrun /* 4260 */