diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-05-28 08:37:19 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2019-05-28 08:37:19 -0700 |
| commit | 24cedeb24492e76bb8f75c8532c76fe700ff4775 (patch) | |
| tree | e829dbbc4aa9acfb18713d6bf90de86ccd6a6a10 /kernel/trace/ring_buffer.c | |
| parent | 2f6ef8a30b780f020b67bf1be17e1949881f8b02 (diff) | |
| parent | 780ec0d562724e68ed866498dedc7c2ef229609f (diff) | |
Merge "Merge android-4.4.180 (71cb827) into msm-4.4"
Diffstat (limited to 'kernel/trace/ring_buffer.c')
| -rw-r--r-- | kernel/trace/ring_buffer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 5e091614fe39..1cf2402c6922 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c @@ -701,7 +701,7 @@ u64 ring_buffer_time_stamp(struct ring_buffer *buffer, int cpu) preempt_disable_notrace(); time = rb_time_stamp(buffer); - preempt_enable_no_resched_notrace(); + preempt_enable_notrace(); return time; } |