Merge tag 'perf-core-for-mingo-4.20-20180905' of git://git.kernel.org/pub/scm/linux...

[linux-block.git] / kernel / events / core.c

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 22ede28ec07d26f42af7eb78504142788fc6459f..abaed4f8bb7f227bafdbc26b465df060a765eaf3 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -1334,7 +1334,7 @@ static u32 perf_event_pid_type(struct perf_event *event, struct task_struct *p,
 
 static u32 perf_event_pid(struct perf_event *event, struct task_struct *p)
 {
-       return perf_event_pid_type(event, p, __PIDTYPE_TGID);
+       return perf_event_pid_type(event, p, PIDTYPE_TGID);
 }
 
 static u32 perf_event_tid(struct perf_event *event, struct task_struct *p)
@@ -5241,8 +5241,8 @@ void perf_event_update_userpage(struct perf_event *event)
 
        userpg = rb->user_page;
        /*
-        * Disable preemption so as to not let the corresponding user-space
-        * spin too long if we get preempted.
+        * Disable preemption to guarantee consistent time stamps are stored to
+        * the user page.
         */
        preempt_disable();
        ++userpg->lock;