Merge branch 'core/signal' into perfcounters/core

This is necessary to avoid the conflict of syscall numbers.

Conflicts:
	arch/x86/ia32/ia32entry.S
	arch/x86/include/asm/unistd_32.h
	arch/x86/include/asm/unistd_64.h

Fixes up the borked syscall numbers of perfcounters versus
preadv/pwritev as well.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --cc arch/x86/ia32/ia32entry.S
index 19c61ef6ab578872299525bb7af74c06bb20e5ea,dcef387ddc36a87cb78554784d02e91808e70fb0..e590261ba059871def263d43e7c174aee25d5753
--- 1/arch/x86/ia32/ia32entry.S
--- 2/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@@ -830,5 -830,5 +830,6 @@@ ia32_sys_call_table
        .quad sys_inotify_init1
        .quad compat_sys_preadv
        .quad compat_sys_pwritev
+       .quad compat_sys_rt_tgsigqueueinfo      /* 335 */
 +      .quad sys_perf_counter_open
  ia32_syscall_end:

diff --cc arch/x86/include/asm/unistd_32.h
index 0b4d8c2b157d816c34da2b7b901b53ec051fe487,708dae61262df4926eaef9d7b4c2aa5a049c0e74..732a307061537241da1ec570e6bf03219623e5c0
--- 1/arch/x86/include/asm/unistd_32.h
--- 2/arch/x86/include/asm/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
@@@ -340,7 -340,7 +340,8 @@@
  #define __NR_inotify_init1    332
  #define __NR_preadv           333
  #define __NR_pwritev          334
- #define __NR_perf_counter_open        333
+ #define __NR_rt_tgsigqueueinfo        335
++#define __NR_perf_counter_open        336
  
  #ifdef __KERNEL__
  

diff --cc arch/x86/include/asm/unistd_64.h
index d9aad876ad767b3ea80b4c7f3d672ff8b46ddb03,4e2b054044000be53a86c2123170969f2851141e..900e1617e6722f8ecf2bac1f90af9286c39c54d9
--- 1/arch/x86/include/asm/unistd_64.h
--- 2/arch/x86/include/asm/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
@@@ -657,8 -657,9 +657,10 @@@ __SYSCALL(__NR_inotify_init1, sys_inoti
  __SYSCALL(__NR_preadv, sys_preadv)
  #define __NR_pwritev                          296
  __SYSCALL(__NR_pwritev, sys_pwritev)
- #define __NR_perf_counter_open                295
+ #define __NR_rt_tgsigqueueinfo                        297
+ __SYSCALL(__NR_rt_tgsigqueueinfo, sys_rt_tgsigqueueinfo)
 -
++#define __NR_perf_counter_open                        298
 +__SYSCALL(__NR_perf_counter_open, sys_perf_counter_open)
  
  #ifndef __NO_STUBS
  #define __ARCH_WANT_OLD_READDIR

diff --cc arch/x86/kernel/syscall_table_32.S
index c3ebbb9013792a179d8ab6a43483e6596047cd31,734f92c02dde0f7dbf4564907dfb920512ee908d..d51321ddafda88885ddbbd03f9c1ef5a482037d9
--- 1/arch/x86/kernel/syscall_table_32.S
--- 2/arch/x86/kernel/syscall_table_32.S
+++ b/arch/x86/kernel/syscall_table_32.S
@@@ -332,6 -332,6 +332,7 @@@ ENTRY(sys_call_table
        .long sys_dup3                  /* 330 */
        .long sys_pipe2
        .long sys_inotify_init1
-       .long sys_perf_counter_open
        .long sys_preadv
        .long sys_pwritev
+       .long sys_rt_tgsigqueueinfo     /* 335 */
++      .long sys_perf_counter_open