diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 12:15:07 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 12:15:07 -0400 |
| commit | 43c1266ce4dc06bfd236cec31e11e9ecd69c0bef (patch) | |
| tree | 40a86739ca4c36200f447f655b01c57cfe646e26 /arch/s390/kernel | |
| parent | b8c7f1dc5ca4e0d10709182233cdab932cef593d (diff) | |
| parent | 57c0c15b5244320065374ad2c54f4fbec77a6428 (diff) | |
Merge branch 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'perfcounters-rename-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf: Tidy up after the big rename
perf: Do the big rename: Performance Counters -> Performance Events
perf_counter: Rename 'event' to event_id/hw_event
perf_counter: Rename list_entry -> group_entry, counter_list -> group_list
Manually resolved some fairly trivial conflicts with the tracing tree in
include/trace/ftrace.h and kernel/trace/trace_syscalls.c.
Diffstat (limited to 'arch/s390/kernel')
| -rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 8 | ||||
| -rw-r--r-- | arch/s390/kernel/syscalls.S | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index 88a83366819f..624790042d41 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S | |||
| @@ -1832,11 +1832,11 @@ compat_sys_rt_tgsigqueueinfo_wrapper: | |||
| 1832 | llgtr %r5,%r5 # struct compat_siginfo * | 1832 | llgtr %r5,%r5 # struct compat_siginfo * |
| 1833 | jg compat_sys_rt_tgsigqueueinfo_wrapper # branch to system call | 1833 | jg compat_sys_rt_tgsigqueueinfo_wrapper # branch to system call |
| 1834 | 1834 | ||
| 1835 | .globl sys_perf_counter_open_wrapper | 1835 | .globl sys_perf_event_open_wrapper |
| 1836 | sys_perf_counter_open_wrapper: | 1836 | sys_perf_event_open_wrapper: |
| 1837 | llgtr %r2,%r2 # const struct perf_counter_attr * | 1837 | llgtr %r2,%r2 # const struct perf_event_attr * |
| 1838 | lgfr %r3,%r3 # pid_t | 1838 | lgfr %r3,%r3 # pid_t |
| 1839 | lgfr %r4,%r4 # int | 1839 | lgfr %r4,%r4 # int |
| 1840 | lgfr %r5,%r5 # int | 1840 | lgfr %r5,%r5 # int |
| 1841 | llgfr %r6,%r6 # unsigned long | 1841 | llgfr %r6,%r6 # unsigned long |
| 1842 | jg sys_perf_counter_open # branch to system call | 1842 | jg sys_perf_event_open # branch to system call |
diff --git a/arch/s390/kernel/syscalls.S b/arch/s390/kernel/syscalls.S index ad1acd200385..0b5083681e77 100644 --- a/arch/s390/kernel/syscalls.S +++ b/arch/s390/kernel/syscalls.S | |||
| @@ -339,4 +339,4 @@ SYSCALL(sys_epoll_create1,sys_epoll_create1,sys_epoll_create1_wrapper) | |||
| 339 | SYSCALL(sys_preadv,sys_preadv,compat_sys_preadv_wrapper) | 339 | SYSCALL(sys_preadv,sys_preadv,compat_sys_preadv_wrapper) |
| 340 | SYSCALL(sys_pwritev,sys_pwritev,compat_sys_pwritev_wrapper) | 340 | SYSCALL(sys_pwritev,sys_pwritev,compat_sys_pwritev_wrapper) |
| 341 | SYSCALL(sys_rt_tgsigqueueinfo,sys_rt_tgsigqueueinfo,compat_sys_rt_tgsigqueueinfo_wrapper) /* 330 */ | 341 | SYSCALL(sys_rt_tgsigqueueinfo,sys_rt_tgsigqueueinfo,compat_sys_rt_tgsigqueueinfo_wrapper) /* 330 */ |
| 342 | SYSCALL(sys_perf_counter_open,sys_perf_counter_open,sys_perf_counter_open_wrapper) | 342 | SYSCALL(sys_perf_event_open,sys_perf_event_open,sys_perf_event_open_wrapper) |