git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
fs
/
jffs2
/
erase.c
diff --git
a/fs/jffs2/erase.c
b/fs/jffs2/erase.c
index
abac961
..
e513f19
100644
(file)
--- 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 */
-
yiel
d();
+
cond_resche
d();
mutex_lock(&c->erase_free_sem);
spin_lock(&c->erase_completion_lock);
}