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/ia32 | |
| 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/ia32')
| -rw-r--r-- | arch/x86/ia32/ia32entry.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S index 19c61ef6ab57..e590261ba059 100644 --- a/arch/x86/ia32/ia32entry.S +++ b/arch/x86/ia32/ia32entry.S | |||
| @@ -830,5 +830,6 @@ ia32_sys_call_table: | |||
| 830 | .quad sys_inotify_init1 | 830 | .quad sys_inotify_init1 |
| 831 | .quad compat_sys_preadv | 831 | .quad compat_sys_preadv |
| 832 | .quad compat_sys_pwritev | 832 | .quad compat_sys_pwritev |
| 833 | .quad compat_sys_rt_tgsigqueueinfo /* 335 */ | ||
| 833 | .quad sys_perf_counter_open | 834 | .quad sys_perf_counter_open |
| 834 | ia32_syscall_end: | 835 | ia32_syscall_end: |