From patchwork Wed Oct 20 22:59:08 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [2/2] jffs2: use cond_resched() instead of yield() Date: Wed, 20 Oct 2010 12:59:08 -0000 From: Andrew Morton X-Patchwork-Id: 68489 Message-Id: <201010202259.o9KMx8tG009573@imap1.linux-foundation.org> To: dwmw2@infradead.org Cc: Artem.Bityutskiy@nokia.com, dedekind@infradead.org, w.sang@pengutronix.de, linux-mtd@lists.infradead.org, akpm@linux-foundation.org, mingo@elte.hu From: Wolfram Sang yield() has different semantics meanwhile and even causes RT-kernels to BUG. Replace the only appearance left in jffs2. Signed-off-by: Wolfram Sang Cc: Artem Bityutskiy Cc: Ingo Molnar Cc: David Woodhouse Cc: Artem Bityutskiy Signed-off-by: Andrew Morton --- fs/jffs2/erase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN fs/jffs2/erase.c~jffs2-use-cond_resched-instead-of-yield fs/jffs2/erase.c --- a/fs/jffs2/erase.c~jffs2-use-cond_resched-instead-of-yield +++ a/fs/jffs2/erase.c @@ -151,7 +151,7 @@ int jffs2_erase_pending_blocks(struct jf } /* Be nice */ - yield(); + cond_resched(); mutex_lock(&c->erase_free_sem); spin_lock(&c->erase_completion_lock); }