diff options
| author | Robert Richter <robert.richter@amd.com> | 2009-06-12 11:58:48 -0400 |
|---|---|---|
| committer | Robert Richter <robert.richter@amd.com> | 2009-06-12 11:58:48 -0400 |
| commit | 1241eb8f136bf3ea409f61590e7663465906d158 (patch) | |
| tree | c8384237f19bb1094d9c90825a74e28393b60d00 /arch/powerpc/include/asm/systbl.h | |
| parent | 51563a0e5650d0d76539625388d72d62b34c726e (diff) | |
| parent | 940010c5a314a7bd9b498593bc6ba1718ac5aec5 (diff) | |
Merge commit 'tip/perfcounters-for-linus' into oprofile/master
Conflicts:
arch/x86/oprofile/op_model_ppro.c
Signed-off-by: Robert Richter <robert.richter@amd.com>
Diffstat (limited to 'arch/powerpc/include/asm/systbl.h')
| -rw-r--r-- | arch/powerpc/include/asm/systbl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/systbl.h b/arch/powerpc/include/asm/systbl.h index d98a30dfd41c..a0b92de51c7e 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h | |||
| @@ -322,6 +322,6 @@ SYSCALL_SPU(epoll_create1) | |||
| 322 | SYSCALL_SPU(dup3) | 322 | SYSCALL_SPU(dup3) |
| 323 | SYSCALL_SPU(pipe2) | 323 | SYSCALL_SPU(pipe2) |
| 324 | SYSCALL(inotify_init1) | 324 | SYSCALL(inotify_init1) |
| 325 | SYSCALL(ni_syscall) | 325 | SYSCALL_SPU(perf_counter_open) |
| 326 | COMPAT_SYS_SPU(preadv) | 326 | COMPAT_SYS_SPU(preadv) |
| 327 | COMPAT_SYS_SPU(pwritev) | 327 | COMPAT_SYS_SPU(pwritev) |