From 86e5b683973f61c3b88b4b5b5c61a00a20c74a7e Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Tue, 5 Feb 2013 14:37:51 +0300 Subject: [PATCH] --- yaml --- r: 350132 b: refs/heads/master c: c3c186403c6abd32e719f005f0af950155a9e54d h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/sched/core.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d1b034d2d36a..76fafb508877 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e0a79f529d5ba2507486d498b25da40911d95cf6 +refs/heads/master: c3c186403c6abd32e719f005f0af950155a9e54d diff --git a/trunk/kernel/sched/core.c b/trunk/kernel/sched/core.c index 26058d0bebba..c5b089df7ea8 100644 --- a/trunk/kernel/sched/core.c +++ b/trunk/kernel/sched/core.c @@ -4371,7 +4371,7 @@ bool __sched yield_to(struct task_struct *p, bool preempt) struct task_struct *curr = current; struct rq *rq, *p_rq; unsigned long flags; - bool yielded = 0; + int yielded = 0; local_irq_save(flags); rq = this_rq();