[PATCH] block core: use round_jiffies on timer to reduce wakeups

[Randy Dunlap <randy.dunlap@oracle.com>]

From: Randy Dunlap <randy.dunlap@oracle.com>

Use round_jiffies() variant to schedule the timer along with
other timer wakeups on the same CPU.

Source file also needs to include jiffies.h since it uses
functions or macros from it.

Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
---
 block/blk-core.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- lnx-2632-rc6.orig/block/blk-core.c
+++ lnx-2632-rc6/block/blk-core.c
@@ -17,6 +17,7 @@
 #include <linux/bio.h>
 #include <linux/blkdev.h>
 #include <linux/highmem.h>
+#include <linux/jiffies.h>
 #include <linux/mm.h>
 #include <linux/kernel_stat.h>
 #include <linux/string.h>
@@ -212,7 +213,8 @@ void blk_plug_device(struct request_queu
 		return;
 
 	if (!queue_flag_test_and_set(QUEUE_FLAG_PLUGGED, q)) {
-		mod_timer(&q->unplug_timer, jiffies + q->unplug_delay);
+		mod_timer(&q->unplug_timer,
+			round_jiffies_up(jiffies + q->unplug_delay));
 		trace_block_plug(q);
 	}
 }