summaryrefslogtreecommitdiff
path: root/block/blk-softirq.c
diff options
context:
space:
mode:
authorScott Wood <scottwood@freescale.com>2015-02-13 22:12:06 (GMT)
committerScott Wood <scottwood@freescale.com>2015-02-13 22:19:22 (GMT)
commit6faa2909871d8937cb2f79a10e1b21ffe193fac1 (patch)
treef558a94f1553814cc122ab8d9e04c0ebad5262a5 /block/blk-softirq.c
parentfcb2fb84301c673ee15ca04e7a2fc965712d49a0 (diff)
downloadlinux-fsl-qoriq-6faa2909871d8937cb2f79a10e1b21ffe193fac1.tar.xz
Reset to 3.12.37
Diffstat (limited to 'block/blk-softirq.c')
-rw-r--r--block/blk-softirq.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/block/blk-softirq.c b/block/blk-softirq.c
index 814b3db..ec9e606 100644
--- a/block/blk-softirq.c
+++ b/block/blk-softirq.c
@@ -51,7 +51,6 @@ static void trigger_softirq(void *data)
raise_softirq_irqoff(BLOCK_SOFTIRQ);
local_irq_restore(flags);
- preempt_check_resched_rt();
}
/*
@@ -94,7 +93,6 @@ static int blk_cpu_notify(struct notifier_block *self, unsigned long action,
&__get_cpu_var(blk_cpu_done));
raise_softirq_irqoff(BLOCK_SOFTIRQ);
local_irq_enable();
- preempt_check_resched_rt();
}
return NOTIFY_OK;
@@ -152,7 +150,6 @@ do_local:
goto do_local;
local_irq_restore(flags);
- preempt_check_resched_rt();
}
/**