projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
[powerpc.git]
/
block
/
ll_rw_blk.c
diff --git
a/block/ll_rw_blk.c
b/block/ll_rw_blk.c
index
f294f15
..
17e1889
100644
(file)
--- a/
block/ll_rw_blk.c
+++ b/
block/ll_rw_blk.c
@@
-1712,7
+1712,6
@@
EXPORT_SYMBOL(blk_stop_queue);
void blk_sync_queue(struct request_queue *q)
{
del_timer_sync(&q->unplug_timer);
void blk_sync_queue(struct request_queue *q)
{
del_timer_sync(&q->unplug_timer);
- kblockd_flush();
}
EXPORT_SYMBOL(blk_sync_queue);
}
EXPORT_SYMBOL(blk_sync_queue);
@@
-3508,7
+3507,7
@@
static int blk_cpu_notify(struct notifier_block *self, unsigned long action,
* If a CPU goes away, splice its entries to the current CPU
* and trigger a run of the softirq
*/
* If a CPU goes away, splice its entries to the current CPU
* and trigger a run of the softirq
*/
- if (action == CPU_DEAD) {
+ if (action == CPU_DEAD
|| action == CPU_DEAD_FROZEN
) {
int cpu = (unsigned long) hcpu;
local_irq_disable();
int cpu = (unsigned long) hcpu;
local_irq_disable();
@@
-3632,11
+3631,11
@@
int kblockd_schedule_work(struct work_struct *work)
EXPORT_SYMBOL(kblockd_schedule_work);
EXPORT_SYMBOL(kblockd_schedule_work);
-void kblockd_flush
(void
)
+void kblockd_flush
_work(struct work_struct *work
)
{
{
-
flush_workqueue(kblockd_workqueue
);
+
cancel_work_sync(work
);
}
}
-EXPORT_SYMBOL(kblockd_flush);
+EXPORT_SYMBOL(kblockd_flush
_work
);
int __init blk_dev_init(void)
{
int __init blk_dev_init(void)
{