diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2019-06-02 14:27:55 -0700 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2019-06-02 14:27:55 -0700 |
| commit | 4d234d563ef0d5fdbb768f4a3a124a5b8bb4ce55 (patch) | |
| tree | 6bc5cdd4bbb90a80e73d76817436ef8d98918420 /kernel/trace/ring_buffer.c | |
| parent | 8b26127e89f84dbc4e99bdee480b602a62182839 (diff) | |
| parent | 77b2a51180290d8417679f03b1a3c2c266149741 (diff) | |
Merge 77b2a51180290d8417679f03b1a3c2c266149741 on remote branch
Change-Id: I1c04bb9bdc40971247a3df6c9155395f9c5733aa
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; } |