From 3da4edb11ce56b0641ac0bda835e941b311422cc Mon Sep 17 00:00:00 2001
From: "Chen, Kenneth W" <kenneth.w.chen@intel.com>
Date: Thu, 13 Oct 2005 21:49:29 +0200
Subject: [PATCH] --- yaml --- r: 10181 b: refs/heads/master c:
 b2982649ce38293b14684b26bcda20cfc54164e6 h: refs/heads/master i:   10179:
 a21b3406fbd7ab1d91a8462c8e98717d6bb5fe1e v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/block/ll_rw_blk.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1819129d6ddf..9c3609cfb205 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20e5c81fcff89535dced2ed71cf24c6c648ff40e
+refs/heads/master: b2982649ce38293b14684b26bcda20cfc54164e6
diff --git a/trunk/drivers/block/ll_rw_blk.c b/trunk/drivers/block/ll_rw_blk.c
index c42071fd2e95..4e2b1b06b411 100644
--- a/trunk/drivers/block/ll_rw_blk.c
+++ b/trunk/drivers/block/ll_rw_blk.c
@@ -2433,6 +2433,9 @@ void disk_round_stats(struct gendisk *disk)
 {
 	unsigned long now = jiffies;
 
+	if (now == disk->stamp)
+		return;
+
 	if (disk->in_flight) {
 		__disk_stat_add(disk, time_in_queue,
 				disk->in_flight * (now - disk->stamp));