Commit 8f40642a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'signal-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'signal-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: hookup sys_rt_tgsigqueueinfo
  signals: implement sys_rt_tgsigqueueinfo
  signals: split do_tkill
parents 20f3f3ca 12d16114

arch/x86/ia32/ia32entry.S

+1 −0
Original line number Diff line number Diff line
@@ -830,4 +830,5 @@ ia32_sys_call_table: 
	.quad sys_inotify_init1

	.quad compat_sys_preadv

	.quad compat_sys_pwritev

	.quad compat_sys_rt_tgsigqueueinfo	/* 335 */

ia32_syscall_end:

arch/x86/include/asm/unistd_32.h

+1 −0
Original line number Diff line number Diff line
@@ -340,6 +340,7 @@ 
#define __NR_inotify_init1	332

#define __NR_preadv		333

#define __NR_pwritev		334

#define __NR_rt_tgsigqueueinfo	335



#ifdef __KERNEL__

arch/x86/include/asm/unistd_64.h

+2 −0
Original line number Diff line number Diff line
@@ -657,6 +657,8 @@ __SYSCALL(__NR_inotify_init1, sys_inotify_init1) 
__SYSCALL(__NR_preadv, sys_preadv)

#define __NR_pwritev				296

__SYSCALL(__NR_pwritev, sys_pwritev)

#define __NR_rt_tgsigqueueinfo			297

__SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)





#ifndef __NO_STUBS

arch/x86/kernel/syscall_table_32.S

+1 −0
Original line number Diff line number Diff line
@@ -334,3 +334,4 @@ ENTRY(sys_call_table) 
	.long sys_inotify_init1

	.long sys_preadv

	.long sys_pwritev

	.long sys_rt_tgsigqueueinfo	/* 335 */

include/linux/compat.h

+2 −0
Original line number Diff line number Diff line
@@ -222,6 +222,8 @@ int copy_siginfo_from_user32(siginfo_t *to, struct compat_siginfo __user *from); 
int copy_siginfo_to_user32(struct compat_siginfo __user *to, siginfo_t *from);

int get_compat_sigevent(struct sigevent *event,

		const struct compat_sigevent __user *u_event);

long compat_sys_rt_tgsigqueueinfo(compat_pid_t tgid, compat_pid_t pid, int sig,

				  struct compat_siginfo __user *uinfo);



static inline int compat_timeval_compare(struct compat_timeval *lhs,

					struct compat_timeval *rhs)