X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=kernel%2Ftime%2Fsched_clock.c;h=8464c5acc91338baee78b465933d59daf5740d5d;hb=f4b62e1e1137507268c2c63dc4e6da279dc58e9f;hp=4a95c0be9daf534939977d082015fcff27fe6dc2;hpb=cc1b923a4e378c943386e7fe6205918d43e5fede;p=linux-2.6-microblaze.git

diff --git a/kernel/time/sched_clock.c b/kernel/time/sched_clock.c
index 4a95c0be9daf..8464c5acc913 100644
--- a/kernel/time/sched_clock.c
+++ b/kernel/time/sched_clock.c
@@ -202,13 +202,11 @@ sched_clock_register(u64 (*read)(void), int bits, unsigned long rate)
 	if (r >= 4000000) {
 		r = DIV_ROUND_CLOSEST(r, 1000000);
 		r_unit = 'M';
+	} else if (r >= 4000) {
+		r = DIV_ROUND_CLOSEST(r, 1000);
+		r_unit = 'k';
 	} else {
-		if (r >= 4000) {
-			r = DIV_ROUND_CLOSEST(r, 1000);
-			r_unit = 'k';
-		} else {
-			r_unit = ' ';
-		}
+		r_unit = ' ';
 	}
 
 	/* Calculate the ns resolution of this counter */