summaryrefslogtreecommitdiffstats
path: root/arch/x86/ia32
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2009-04-30 21:12:13 +0200
committerThomas Gleixner <tglx@linutronix.de>2009-04-30 21:16:49 +0200
commit3c56999eec7acc105a31b4546c94aad2fb844b13 (patch)
tree293aef41f1441875323541cbc4f790c291b83679 /arch/x86/ia32
parentbad760089c1ef7fe525c0f268a4078b9cb483903 (diff)
parent12d161147f828192b5bcc33166f468a827832767 (diff)
downloadop-kernel-dev-3c56999eec7acc105a31b4546c94aad2fb844b13.zip
op-kernel-dev-3c56999eec7acc105a31b4546c94aad2fb844b13.tar.gz
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>
Diffstat (limited to 'arch/x86/ia32')
-rw-r--r--arch/x86/ia32/ia32entry.S1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 19c61ef..e590261 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -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:
OpenPOWER on IntegriCloud