From 18ed56613844179234c6bb7f82617a17a58f088c Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Tue, 16 Dec 2008 22:08:58 +0100 Subject: [PATCH] --- yaml --- r: 121285 b: refs/heads/master c: 2c2d7329d8afa9efa3ec24e19a53e7be9d14f242 h: refs/heads/master i: 121283: 32f0d65478d328eba03c6fdefcb8ee07113a479e v: v3 --- [refs] | 2 +- trunk/kernel/trace/ring_buffer.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cee72bdc8545..40abc779bea7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9dfc3bc7d21864d47797d64b8d531d4dbbc0b618 +refs/heads/master: 2c2d7329d8afa9efa3ec24e19a53e7be9d14f242 diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c index 7f69cfeaadf7..eab81f918f6a 100644 --- a/trunk/kernel/trace/ring_buffer.c +++ b/trunk/kernel/trace/ring_buffer.c @@ -107,7 +107,7 @@ u64 ring_buffer_time_stamp(int cpu) preempt_disable_notrace(); /* shift to debug/test normalization and TIME_EXTENTS */ time = sched_clock() << DEBUG_SHIFT; - preempt_enable_notrace(); + preempt_enable_no_resched_notrace(); return time; }