summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2016-07-13 18:01:34 +0300
committerThomas Gleixner <tglx@linutronix.de>2016-07-13 18:01:51 +0300
commit54f54496779661678d906b57e4cba48239ab7c9b (patch)
treefeb06330bfa37391a5502e8dc6dfdd58b46b56fb /block
parent92d21ac74a9e3c09b0b01c764e530657e4c85c49 (diff)
parent1d661bf5327a2c059ec967f850e89362e637f4e6 (diff)
downloadlinux-54f54496779661678d906b57e4cba48239ab7c9b.tar.xz
Merge branch 'timers/core' into smp/hotplug to pick up dependencies
Diffstat (limited to 'block')
-rw-r--r--block/genhd.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/block/genhd.c b/block/genhd.c
index 9f42526b4d62..f06d7f3b075b 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -1523,12 +1523,7 @@ static void __disk_unblock_events(struct gendisk *disk, bool check_now)
if (--ev->block)
goto out_unlock;
- /*
- * Not exactly a latency critical operation, set poll timer
- * slack to 25% and kick event check.
- */
intv = disk_events_poll_jiffies(disk);
- set_timer_slack(&ev->dwork.timer, intv / 4);
if (check_now)
queue_delayed_work(system_freezable_power_efficient_wq,
&ev->dwork, 0);