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

[PATCH] common compat_sys_timer_create

Browse Source 
The comment in compat.c is wrong, every architecture provides a
get_compat_sigevent() for the IPC compat code already.

This basically moves the x86_64 version to common code and removes all the
others.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Acked-by: Paul Mackerras <paulus@samba.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Acked-by: Andi Kleen <ak@muc.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Christoph Hellwig
2006-01-09 20:52:08 -08:00
committed by Linus Torvalds
parent f042e0f80b
commit 3a0f69d59b
11 changed files with 23 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
arch/s390/kernel/compat_linux.c
View File

@ -1013,38 +1013,6 @@ asmlinkage long sys32_clone(struct pt_regs regs)
parent_tidptr, child_tidptr);
}
/*
* Wrapper function for sys_timer_create.
*/
extern asmlinkage long
sys_timer_create(clockid_t, struct sigevent *, timer_t *);
asmlinkage long
sys32_timer_create(clockid_t which_clock, struct compat_sigevent *se32,
timer_t *timer_id)
{
struct sigevent se;
timer_t ktimer_id;
mm_segment_t old_fs;
long ret;
if (se32 == NULL)
return sys_timer_create(which_clock, NULL, timer_id);
if (get_compat_sigevent(&se, se32))
return -EFAULT;
old_fs = get_fs();
set_fs(KERNEL_DS);
ret = sys_timer_create(which_clock, &se, &ktimer_id);
set_fs(old_fs);
if (!ret)
ret = put_user (ktimer_id, timer_id);
return ret;
}
/*
* 31 bit emulation wrapper functions for sys_fadvise64/fadvise64_64.
* These need to rewrite the advise values for POSIX_FADV_{DONTNEED,NOREUSE}

2
arch/s390/kernel/compat_wrapper.S
View File

@ -1289,7 +1289,7 @@ sys32_timer_create_wrapper:
lgfr %r2,%r2 # timer_t (int)
llgtr %r3,%r3 # struct compat_sigevent *
llgtr %r4,%r4 # timer_t *
jg sys32_timer_create
jg compat_sys_timer_create
.globl sys32_timer_settime_wrapper
sys32_timer_settime_wrapper: