From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 30 Apr 2009 19:12:13 +0000 (+0200)
Subject: Merge branch 'core/signal' into perfcounters/core
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3c56999eec7acc105a31b4546c94aad2fb844b13;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

3c56999eec7acc105a31b4546c94aad2fb844b13
diff --cc arch/x86/ia32/ia32entry.S
index 19c61ef6ab57,dcef387ddc36..e590261ba059
--- a/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 0b4d8c2b157d,708dae61262d..732a30706153
--- a/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 d9aad876ad76,4e2b05404400..900e1617e672
--- a/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 c3ebbb901379,734f92c02dde..d51321ddafda
--- a/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