projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
time/sched_clock: Fix formatting of frequency reporting code
[linux-2.6-microblaze.git]
/
kernel
/
time
/
sched_clock.c
diff --git
a/kernel/time/sched_clock.c
b/kernel/time/sched_clock.c
index
4a95c0b
..
8464c5a
100644
(file)
--- 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';
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 {
} 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 */
}
/* Calculate the ns resolution of this counter */