Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
arch
/
mips
/
kernel
/
csrc-r4k.c
diff --git
a/kernel/arch/mips/kernel/csrc-r4k.c
b/kernel/arch/mips/kernel/csrc-r4k.c
index
1f91056
..
d76275d
100644
(file)
--- a/
kernel/arch/mips/kernel/csrc-r4k.c
+++ b/
kernel/arch/mips/kernel/csrc-r4k.c
@@
-23,7
+23,7
@@
static struct clocksource clocksource_mips = {
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
.flags = CLOCK_SOURCE_IS_CONTINUOUS,
};
-static u64 notrace r4k_read_sched_clock(void)
+static u64
__maybe_unused
notrace r4k_read_sched_clock(void)
{
return read_c0_count();
}
{
return read_c0_count();
}
@@
-82,7
+82,9
@@
int __init init_r4k_clocksource(void)
clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);
clocksource_register_hz(&clocksource_mips, mips_hpt_frequency);
+#ifndef CONFIG_CPU_FREQ
sched_clock_register(r4k_read_sched_clock, 32, mips_hpt_frequency);
sched_clock_register(r4k_read_sched_clock, 32, mips_hpt_frequency);
+#endif
return 0;
}
return 0;
}