diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2009-04-30 15:12:13 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2009-04-30 15:16:49 -0400 |
| commit | 3c56999eec7acc105a31b4546c94aad2fb844b13 (patch) | |
| tree | 293aef41f1441875323541cbc4f790c291b83679 /arch/x86/kernel/syscall_table_32.S | |
| parent | bad760089c1ef7fe525c0f268a4078b9cb483903 (diff) | |
| parent | 12d161147f828192b5bcc33166f468a827832767 (diff) | |
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/kernel/syscall_table_32.S')
| -rw-r--r-- | arch/x86/kernel/syscall_table_32.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S index c3ebbb901379..d51321ddafda 100644 --- a/arch/x86/kernel/syscall_table_32.S +++ b/arch/x86/kernel/syscall_table_32.S | |||
| @@ -332,6 +332,7 @@ ENTRY(sys_call_table) | |||
| 332 | .long sys_dup3 /* 330 */ | 332 | .long sys_dup3 /* 330 */ |
| 333 | .long sys_pipe2 | 333 | .long sys_pipe2 |
| 334 | .long sys_inotify_init1 | 334 | .long sys_inotify_init1 |
| 335 | .long sys_perf_counter_open | ||
| 336 | .long sys_preadv | 335 | .long sys_preadv |
| 337 | .long sys_pwritev | 336 | .long sys_pwritev |
| 337 | .long sys_rt_tgsigqueueinfo /* 335 */ | ||
| 338 | .long sys_perf_counter_open | ||