diff options
| author | Elliott Hughes <enh@google.com> | 2012-10-11 10:26:00 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-11 10:26:00 -0700 |
| commit | 417fd2334a694cf6a831b81cd672b4ca31ff2f54 (patch) | |
| tree | c9c6bf19d09422f8ba8a91b8b734867501880bf8 | |
| parent | 1ceb9824ab39501e98300bc87f7984ee6b455ce8 (diff) | |
| parent | 4e75c4b2d745c673f5fe20676f7b53eedbec2853 (diff) | |
| download | android_bionic-417fd2334a694cf6a831b81cd672b4ca31ff2f54.tar.gz android_bionic-417fd2334a694cf6a831b81cd672b4ca31ff2f54.tar.bz2 android_bionic-417fd2334a694cf6a831b81cd672b4ca31ff2f54.zip | |
Merge "Fix perf_event_open syscall for x86 and mips"
| -rw-r--r-- | libc/SYSCALLS.TXT | 2 | ||||
| -rw-r--r-- | libc/include/sys/linux-syscalls.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libc/SYSCALLS.TXT b/libc/SYSCALLS.TXT index d79e6f38b..58e0ac133 100644 --- a/libc/SYSCALLS.TXT +++ b/libc/SYSCALLS.TXT @@ -288,7 +288,7 @@ int delete_module(const char*, unsigned int) 129 int klogctl:syslog(int, char *, int) 103 int sysinfo(struct sysinfo *) 116 int personality(unsigned long) 136 -long perf_event_open(struct perf_event_attr *attr_uptr, pid_t pid, int cpu, int group_fd, unsigned long flags) 364 +long perf_event_open(struct perf_event_attr *attr_uptr, pid_t pid, int cpu, int group_fd, unsigned long flags) 364,336,333 # futex int futex(void *, int, int, void *, void *, int) 240,240,238 diff --git a/libc/include/sys/linux-syscalls.h b/libc/include/sys/linux-syscalls.h index 89ab167c3..f2249fdef 100644 --- a/libc/include/sys/linux-syscalls.h +++ b/libc/include/sys/linux-syscalls.h @@ -84,7 +84,6 @@ #define __NR_readv (__NR_SYSCALL_BASE + 145) #define __NR_writev (__NR_SYSCALL_BASE + 146) #define __NR_getsid (__NR_SYSCALL_BASE + 147) -#define __NR_perf_event_open (__NR_SYSCALL_BASE + 364) #ifdef __arm__ #define __NR_exit_group (__NR_SYSCALL_BASE + 248) @@ -202,6 +201,7 @@ #define __NR_getcpu (__NR_SYSCALL_BASE + 345) #define __NR_ioprio_set (__NR_SYSCALL_BASE + 314) #define __NR_ioprio_get (__NR_SYSCALL_BASE + 315) +#define __NR_perf_event_open (__NR_SYSCALL_BASE + 364) #define __NR_futex (__NR_SYSCALL_BASE + 240) #define __NR_epoll_create (__NR_SYSCALL_BASE + 250) #define __NR_epoll_ctl (__NR_SYSCALL_BASE + 251) @@ -330,6 +330,7 @@ #define __NR_utimensat (__NR_SYSCALL_BASE + 320) #define __NR_eventfd2 (__NR_SYSCALL_BASE + 328) #define __NR_pipe2 (__NR_SYSCALL_BASE + 331) +#define __NR_perf_event_open (__NR_SYSCALL_BASE + 336) #endif #ifdef __mips__ @@ -462,6 +463,7 @@ #define __NR_utimensat (__NR_SYSCALL_BASE + 316) #define __NR_eventfd2 (__NR_SYSCALL_BASE + 325) #define __NR_pipe2 (__NR_SYSCALL_BASE + 328) +#define __NR_perf_event_open (__NR_SYSCALL_BASE + 333) #endif #endif |