summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2017-09-05 14:12:35 +0200
committerIngo Molnar <mingo@kernel.org>2017-10-27 10:31:58 +0200
commit8ca2bd41c7d1c135e9ac6f25970c2d491865088a (patch)
tree3fd5caf25aba6cd0b3088219bcd6efe81f061070 /kernel
parentperf/core: Make sure to update ctx time before using it (diff)
downloadlinux-8ca2bd41c7d1c135e9ac6f25970c2d491865088a.tar.xz
linux-8ca2bd41c7d1c135e9ac6f25970c2d491865088a.zip
perf/core: Rename 'enum perf_event_active_state'
Its a weird name, active is one of the states, it should not be part of the name, also, its too long. Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/events/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/events/core.c b/kernel/events/core.c
index b249e0f197a7..6322e245176c 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -10801,7 +10801,7 @@ inherit_event(struct perf_event *parent_event,
struct perf_event *group_leader,
struct perf_event_context *child_ctx)
{
- enum perf_event_active_state parent_state = parent_event->state;
+ enum perf_event_state parent_state = parent_event->state;
struct perf_event *child_event;
unsigned long flags;