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
ARM: OMAP3: PM: remove access to PRM_VOLTCTRL register
[pandora-kernel.git]
/
block
/
blk-lib.c
diff --git
a/block/blk-lib.c
b/block/blk-lib.c
index
2b461b4
..
36751e2
100644
(file)
--- a/
block/blk-lib.c
+++ b/
block/blk-lib.c
@@
-101,6
+101,14
@@
int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
atomic_inc(&bb.done);
submit_bio(type, bio);
atomic_inc(&bb.done);
submit_bio(type, bio);
+
+ /*
+ * We can loop for a long time in here, if someone does
+ * full device discards (like mkfs). Be nice and allow
+ * us to schedule out to avoid softlocking if preempt
+ * is disabled.
+ */
+ cond_resched();
}
/* Wait for bios in-flight */
}
/* Wait for bios in-flight */