git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
arch
/
i386
/
kernel
/
timers
/
timer_tsc.c
diff --git
a/arch/i386/kernel/timers/timer_tsc.c
b/arch/i386/kernel/timers/timer_tsc.c
index
f1187dd
..
a7f5a2a
100644
(file)
--- a/
arch/i386/kernel/timers/timer_tsc.c
+++ b/
arch/i386/kernel/timers/timer_tsc.c
@@
-74,7
+74,7
@@
late_initcall(start_lost_tick_compensation);
*
* -johnstul@us.ibm.com "math is hard, lets go shopping!"
*/
*
* -johnstul@us.ibm.com "math is hard, lets go shopping!"
*/
-static unsigned long cyc2ns_scale
__read_mostly;
+static unsigned long cyc2ns_scale
;
#define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */
static inline void set_cyc2ns_scale(unsigned long cpu_khz)
#define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */
static inline void set_cyc2ns_scale(unsigned long cpu_khz)
@@
-279,7
+279,7
@@
time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
{
struct cpufreq_freqs *freq = data;
{
struct cpufreq_freqs *freq = data;
- if (val != CPUFREQ_RESUMECHANGE
&& val != CPUFREQ_SUSPENDCHANGE
)
+ if (val != CPUFREQ_RESUMECHANGE)
write_seqlock_irq(&xtime_lock);
if (!ref_freq) {
if (!freq->old){
write_seqlock_irq(&xtime_lock);
if (!ref_freq) {
if (!freq->old){
@@
-312,7
+312,7
@@
time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
}
end:
}
end:
- if (val != CPUFREQ_RESUMECHANGE
&& val != CPUFREQ_SUSPENDCHANGE
)
+ if (val != CPUFREQ_RESUMECHANGE)
write_sequnlock_irq(&xtime_lock);
return 0;
write_sequnlock_irq(&xtime_lock);
return 0;