summaryrefslogtreecommitdiffstats
path: root/fs/jffs2
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2010-09-01 18:03:41 +0200
committerDavid Woodhouse <David.Woodhouse@intel.com>2010-10-25 00:14:01 +0100
commit3866f673ebd86e5be2533923f5c0aed91fe1669f (patch)
treead86078472f545ddb7a607d1e7b115472855dd1d /fs/jffs2
parentd2ac467a108400ff1ae682a423c7d41265e62d47 (diff)
downloadlinux-3866f673ebd86e5be2533923f5c0aed91fe1669f.tar.bz2
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 <w.sang@pengutronix.de> Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com> Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'fs/jffs2')
-rw-r--r--fs/jffs2/erase.c2
1 files changed, 1 insertions, 1 deletions
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);
}