diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/time/hrtimer.c | 1 | ||||
-rw-r--r-- | kernel/trace/ring_buffer_benchmark.c | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index 1c2fe7de2842..ab370ffffd53 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c | |||
@@ -1776,7 +1776,6 @@ schedule_hrtimeout_range_clock(ktime_t *expires, unsigned long delta, | |||
1776 | */ | 1776 | */ |
1777 | if (!expires) { | 1777 | if (!expires) { |
1778 | schedule(); | 1778 | schedule(); |
1779 | __set_current_state(TASK_RUNNING); | ||
1780 | return -EINTR; | 1779 | return -EINTR; |
1781 | } | 1780 | } |
1782 | 1781 | ||
diff --git a/kernel/trace/ring_buffer_benchmark.c b/kernel/trace/ring_buffer_benchmark.c index 0434ff1b808e..3f9e328c30b5 100644 --- a/kernel/trace/ring_buffer_benchmark.c +++ b/kernel/trace/ring_buffer_benchmark.c | |||
@@ -205,7 +205,6 @@ static void ring_buffer_consumer(void) | |||
205 | break; | 205 | break; |
206 | 206 | ||
207 | schedule(); | 207 | schedule(); |
208 | __set_current_state(TASK_RUNNING); | ||
209 | } | 208 | } |
210 | reader_finish = 0; | 209 | reader_finish = 0; |
211 | complete(&read_done); | 210 | complete(&read_done); |
@@ -379,7 +378,6 @@ static int ring_buffer_consumer_thread(void *arg) | |||
379 | break; | 378 | break; |
380 | 379 | ||
381 | schedule(); | 380 | schedule(); |
382 | __set_current_state(TASK_RUNNING); | ||
383 | } | 381 | } |
384 | __set_current_state(TASK_RUNNING); | 382 | __set_current_state(TASK_RUNNING); |
385 | 383 | ||
@@ -407,7 +405,6 @@ static int ring_buffer_producer_thread(void *arg) | |||
407 | trace_printk("Sleeping for 10 secs\n"); | 405 | trace_printk("Sleeping for 10 secs\n"); |
408 | set_current_state(TASK_INTERRUPTIBLE); | 406 | set_current_state(TASK_INTERRUPTIBLE); |
409 | schedule_timeout(HZ * SLEEP_TIME); | 407 | schedule_timeout(HZ * SLEEP_TIME); |
410 | __set_current_state(TASK_RUNNING); | ||
411 | } | 408 | } |
412 | 409 | ||
413 | if (kill_test) | 410 | if (kill_test) |