From 3f524a68272b2f549731dd76d92ce98563745d0e Mon Sep 17 00:00:00 2001
From: Richard Kennedy <richard@rsk.demon.co.uk>
Date: Mon, 1 Mar 2010 10:57:22 +0100
Subject: [PATCH] --- yaml --- r: 182949 b: refs/heads/master c:
 4671a1322052425afa38fcb7980d2fd2bb0fc99b h: refs/heads/master i:   182947:
 677e47d0cceb6e95cde84ab97eedb10adf1f33ae v: v3

---
 [refs]                | 2 +-
 trunk/block/blk-ioc.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 73ef62885ce7..2837ec7c49c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 73e9ffdd0cc8159f876d5e29ecf2d9c1bfca544f
+refs/heads/master: 4671a1322052425afa38fcb7980d2fd2bb0fc99b
diff --git a/trunk/block/blk-ioc.c b/trunk/block/blk-ioc.c
index 98e6bf61b0ac..3f65c8aadb2f 100644
--- a/trunk/block/blk-ioc.c
+++ b/trunk/block/blk-ioc.c
@@ -91,7 +91,7 @@ struct io_context *alloc_io_context(gfp_t gfp_flags, int node)
 		spin_lock_init(&ret->lock);
 		ret->ioprio_changed = 0;
 		ret->ioprio = 0;
-		ret->last_waited = jiffies; /* doesn't matter... */
+		ret->last_waited = 0; /* doesn't matter... */
 		ret->nr_batch_requests = 0; /* because this is 0 */
 		INIT_RADIX_TREE(&ret->radix_root, GFP_ATOMIC | __GFP_HIGH);
 		INIT_HLIST_HEAD(&ret->cic_list);