From: Wolfram Sang Date: Wed, 1 Sep 2010 16:03:41 +0000 (+0200) Subject: jffs2: use cond_resched() instead of yield() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3866f673ebd86e5be2533923f5c0aed91fe1669f;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git jffs2: use cond_resched() instead of yield() yield() has different semantics meanwhile and even causes RT-kernels to BUG. Replace the only appearance left in jffs2. Signed-off-by: Wolfram Sang Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse --- diff --git a/fs/jffs2/erase.c b/fs/jffs2/erase.c index abac961f617b..e513f1913c15 100644 --- a/fs/jffs2/erase.c +++ b/fs/jffs2/erase.c @@ -151,7 +151,7 @@ int jffs2_erase_pending_blocks(struct jffs2_sb_info *c, int count) } /* Be nice */ - yield(); + cond_resched(); mutex_lock(&c->erase_free_sem); spin_lock(&c->erase_completion_lock); }