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 /kernel/Makefile | |
| 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 'kernel/Makefile')
| -rw-r--r-- | kernel/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/Makefile b/kernel/Makefile index 7c9b0a585502..187c89b4783d 100644 --- a/kernel/Makefile +++ b/kernel/Makefile | |||
| @@ -95,7 +95,7 @@ obj-$(CONFIG_X86_DS) += trace/ | |||
| 95 | obj-$(CONFIG_RING_BUFFER) += trace/ | 95 | obj-$(CONFIG_RING_BUFFER) += trace/ |
| 96 | obj-$(CONFIG_SMP) += sched_cpupri.o | 96 | obj-$(CONFIG_SMP) += sched_cpupri.o |
| 97 | obj-$(CONFIG_SLOW_WORK) += slow-work.o | 97 | obj-$(CONFIG_SLOW_WORK) += slow-work.o |
| 98 | obj-$(CONFIG_PERF_COUNTERS) += perf_counter.o | 98 | obj-$(CONFIG_PERF_EVENTS) += perf_event.o |
| 99 | 99 | ||
| 100 | ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y) | 100 | ifneq ($(CONFIG_SCHED_OMIT_FRAME_POINTER),y) |
| 101 | # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is | 101 | # According to Alan Modra <alan@linuxcare.com.au>, the -fno-omit-frame-pointer is |