diff options
| author | Fengwei Yin <fengwei.yin@intel.com> | 2012-08-09 14:26:53 +0800 |
|---|---|---|
| committer | Shuo Gao <shuo.gao@intel.com> | 2012-09-10 09:28:15 +0800 |
| commit | 235a281cbda1f38d70362ef7c15d5da959945973 (patch) | |
| tree | eecd372c819d1545b6170ecccd863e4c699cdee7 | |
| parent | 73738c3d24cf7dba450c3e3d6fcb057b3835303f (diff) | |
| download | kernel-headers-235a281cbda1f38d70362ef7c15d5da959945973.tar.gz | |
kernel-head: __NR_perf_event_open has wrong definition for x86
__NR_perf_event_open has wrong definition for x86. It should be
defined as 336 for x86.
Pulled from kernel/common and android-3.0 branch.
The SHA1 is 7b21fddd087678a70ad64afc0f632e0f1071b092
Change-Id: I56f850bc84b581a12079dd42f7ca4395e4323ba5
Author: Fengwei Yin <fengwei.yin@intel.com>
Singed-off-by: Shuo Gao <shuo.gao@intel.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
Author-tracking-BZ: 50889
| -rw-r--r-- | original/asm-x86/unistd_32.h | 39 |
1 files changed, 32 insertions, 7 deletions
diff --git a/original/asm-x86/unistd_32.h b/original/asm-x86/unistd_32.h index 8121a1c..593485b 100644 --- a/original/asm-x86/unistd_32.h +++ b/original/asm-x86/unistd_32.h @@ -1,5 +1,5 @@ -#ifndef _ASM_I386_UNISTD_H_ -#define _ASM_I386_UNISTD_H_ +#ifndef _ASM_X86_UNISTD_32_H +#define _ASM_X86_UNISTD_32_H /* * This file contains the system call numbers. @@ -81,7 +81,7 @@ #define __NR_sigpending 73 #define __NR_sethostname 74 #define __NR_setrlimit 75 -#define __NR_getrlimit 76 /* Back compatible 2Gig limited rlimit */ +#define __NR_getrlimit 76 /* Back compatible 2Gig limited rlimit */ #define __NR_getrusage 77 #define __NR_gettimeofday 78 #define __NR_settimeofday 79 @@ -327,14 +327,35 @@ #define __NR_epoll_pwait 319 #define __NR_utimensat 320 #define __NR_signalfd 321 -#define __NR_timerfd 322 +#define __NR_timerfd_create 322 #define __NR_eventfd 323 #define __NR_fallocate 324 -#define __NR_perf_event_open 364 +#define __NR_timerfd_settime 325 +#define __NR_timerfd_gettime 326 +#define __NR_signalfd4 327 +#define __NR_eventfd2 328 +#define __NR_epoll_create1 329 +#define __NR_dup3 330 +#define __NR_pipe2 331 +#define __NR_inotify_init1 332 +#define __NR_preadv 333 +#define __NR_pwritev 334 +#define __NR_rt_tgsigqueueinfo 335 +#define __NR_perf_event_open 336 +#define __NR_recvmmsg 337 +#define __NR_fanotify_init 338 +#define __NR_fanotify_mark 339 +#define __NR_prlimit64 340 +#define __NR_name_to_handle_at 341 +#define __NR_open_by_handle_at 342 +#define __NR_clock_adjtime 343 +#define __NR_syncfs 344 +#define __NR_sendmmsg 345 +#define __NR_setns 346 #ifdef __KERNEL__ -#define NR_syscalls 325 +#define NR_syscalls 347 #define __ARCH_WANT_IPC_PARSE_VERSION #define __ARCH_WANT_OLD_READDIR @@ -342,6 +363,7 @@ #define __ARCH_WANT_STAT64 #define __ARCH_WANT_SYS_ALARM #define __ARCH_WANT_SYS_GETHOSTNAME +#define __ARCH_WANT_SYS_IPC #define __ARCH_WANT_SYS_PAUSE #define __ARCH_WANT_SYS_SGETMASK #define __ARCH_WANT_SYS_SIGNAL @@ -354,6 +376,9 @@ #define __ARCH_WANT_SYS_LLSEEK #define __ARCH_WANT_SYS_NICE #define __ARCH_WANT_SYS_OLD_GETRLIMIT +#define __ARCH_WANT_SYS_OLD_UNAME +#define __ARCH_WANT_SYS_OLD_MMAP +#define __ARCH_WANT_SYS_OLD_SELECT #define __ARCH_WANT_SYS_OLDUMOUNT #define __ARCH_WANT_SYS_SIGPENDING #define __ARCH_WANT_SYS_SIGPROCMASK @@ -371,4 +396,4 @@ #endif #endif /* __KERNEL__ */ -#endif /* _ASM_I386_UNISTD_H_ */ +#endif /* _ASM_X86_UNISTD_32_H */ |