diff --git a/[refs] b/[refs]
index c16dd2b7695e..102c513fb186 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ef2a701d444a4ea9790146e92756b0dde5070a15
+refs/heads/master: c9b3ad673460fc997a652cd58aa3a345d40e5218
diff --git a/trunk/drivers/block/as-iosched.c b/trunk/drivers/block/as-iosched.c
index 91aeb678135d..95c0a3690b0f 100644
--- a/trunk/drivers/block/as-iosched.c
+++ b/trunk/drivers/block/as-iosched.c
@@ -1935,23 +1935,15 @@ struct as_fs_entry {
 static ssize_t
 as_var_show(unsigned int var, char *page)
 {
-	var = (var * 1000) / HZ;
 	return sprintf(page, "%d\n", var);
 }
 
 static ssize_t
 as_var_store(unsigned long *var, const char *page, size_t count)
 {
-	unsigned long tmp;
 	char *p = (char *) page;
 
-	tmp = simple_strtoul(p, &p, 10);
-	if (tmp != 0) {
-		tmp = (tmp * HZ) / 1000;
-		if (tmp == 0)
-			tmp = 1;
-	}
-	*var = tmp;
+	*var = simple_strtoul(p, &p, 10);
 	return count;
 }