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/include/asm/unistd_32.h | |
| 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/include/asm/unistd_32.h')
| -rw-r--r-- | arch/x86/include/asm/unistd_32.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/unistd_32.h b/arch/x86/include/asm/unistd_32.h index 0b4d8c2b157d..732a30706153 100644 --- a/arch/x86/include/asm/unistd_32.h +++ b/arch/x86/include/asm/unistd_32.h | |||
| @@ -340,7 +340,8 @@ | |||
| 340 | #define __NR_inotify_init1 332 | 340 | #define __NR_inotify_init1 332 |
| 341 | #define __NR_preadv 333 | 341 | #define __NR_preadv 333 |
| 342 | #define __NR_pwritev 334 | 342 | #define __NR_pwritev 334 |
| 343 | #define __NR_perf_counter_open 333 | 343 | #define __NR_rt_tgsigqueueinfo 335 |
| 344 | #define __NR_perf_counter_open 336 | ||
| 344 | 345 | ||
| 345 | #ifdef __KERNEL__ | 346 | #ifdef __KERNEL__ |
| 346 | 347 | ||