diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:03:29 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-26 07:03:29 -0500 |
| commit | 0c489c47d45ecac21059567c163f92138b2fbaa2 (patch) | |
| tree | e04cacae82ce2d9614c2319921da501c4acddd46 /arch/powerpc | |
| parent | 8e818179eb9e8f9e44d8410dd2a25077d026a08e (diff) | |
| parent | f3dfd2656deb81a0addee4f4ceff66b50a387388 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/perfcounters into perfcounters/core
Diffstat (limited to 'arch/powerpc')
| -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 4c8095f6bec0..d312eec8abb9 100644 --- a/arch/powerpc/include/asm/systbl.h +++ b/arch/powerpc/include/asm/systbl.h | |||
| @@ -322,4 +322,4 @@ 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(perf_counter_open) | 325 | SYSCALL_SPU(perf_counter_open) |