Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a0f69d5 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Linus Torvalds
Browse files

[PATCH] common compat_sys_timer_create 



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: default avatarChristoph Hellwig <hch@lst.de>
Acked-by: default avatarPaul 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: default avatarAndi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f042e0f8

arch/ia64/ia32/ia32_entry.S

+1 −1
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ ia32_syscall_table: 
	data8 sys32_epoll_wait

	data8 sys_remap_file_pages

	data8 sys_set_tid_address

 	data8 sys32_timer_create

 	data8 compat_sys_timer_create

 	data8 compat_sys_timer_settime	/* 260 */

 	data8 compat_sys_timer_gettime

 	data8 sys_timer_getoverrun

arch/ia64/ia32/sys_ia32.c

+0 −28
Original line number Diff line number Diff line
@@ -2553,34 +2553,6 @@ sys32_get_thread_area (struct ia32_user_desc __user *u_info) 
	return 0;

}



asmlinkage long

sys32_timer_create(u32 clock, struct compat_sigevent __user *se32, timer_t __user *timer_id)

{

	struct sigevent se;

	mm_segment_t oldfs;

	timer_t t;

	long err;



	if (se32 == NULL)

		return sys_timer_create(clock, NULL, timer_id);



	if (get_compat_sigevent(&se, se32))

		return -EFAULT;



	if (!access_ok(VERIFY_WRITE,timer_id,sizeof(timer_t)))

		return -EFAULT;



	oldfs = get_fs();

	set_fs(KERNEL_DS);

	err = sys_timer_create(clock, (struct sigevent __user *) &se, (timer_t __user *) &t);

	set_fs(oldfs);



	if (!err)

		err = __put_user (t, timer_id);



	return err;

}



long sys32_fadvise64_64(int fd, __u32 offset_low, __u32 offset_high, 

			__u32 len_low, __u32 len_high, int advice)

{

arch/powerpc/kernel/sys_ppc32.c

+0 −32
Original line number Diff line number Diff line
@@ -956,38 +956,6 @@ long ppc32_fadvise64(int fd, u32 unused, u32 offset_high, u32 offset_low, 
			     advice);

}



long ppc32_timer_create(clockid_t clock,

			struct compat_sigevent __user *ev32,

			timer_t __user *timer_id)

{

	sigevent_t event;

	timer_t t;

	long err;

	mm_segment_t savefs;



	if (ev32 == NULL)

		return sys_timer_create(clock, NULL, timer_id);



	if (get_compat_sigevent(&event, ev32))

		return -EFAULT;



	if (!access_ok(VERIFY_WRITE, timer_id, sizeof(timer_t)))

		return -EFAULT;



	savefs = get_fs();

	set_fs(KERNEL_DS);

	/* The __user pointer casts are valid due to the set_fs() */

	err = sys_timer_create(clock,

		(sigevent_t __user *) &event,

		(timer_t __user *) &t);

	set_fs(savefs);



	if (err == 0)

		err = __put_user(t, timer_id);



	return err;

}



asmlinkage long compat_sys_add_key(const char __user *_type,

			      const char __user *_description,

			      const void __user *_payload,

arch/powerpc/kernel/systbl.S

+1 −1
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ SYSCALL(epoll_create) 
SYSCALL(epoll_ctl)

SYSCALL(epoll_wait)

SYSCALL(remap_file_pages)

SYSX(sys_timer_create,ppc32_timer_create,sys_timer_create)

SYSX(sys_timer_create,compat_sys_timer_create,sys_timer_create)

COMPAT_SYS(timer_settime)

COMPAT_SYS(timer_gettime)

SYSCALL(timer_getoverrun)

arch/s390/kernel/compat_linux.c

+0 −32
Original line number Diff line number Diff line
@@ -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}