Skip to contentSkip to conversation

Mark cyc2ns_scale readmostly

PATCH In review Ravikiran G Thirumalai 2 participants 2 messages Mar 17, 2006 – Mar 18, 2006

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Mark cyc2ns_scale readmostly

This variable is rarely written to. Mark the variable accordingly

arch/i386/kernel/tsc.c +1 -1
Index: linux-2.6.16-rc6mm1/arch/i386/kernel/tsc.c
===================================================================
@@ -87,7 +87,7 @@ EXPORT_SYMBOL_GPL(mark_tsc_unstable);
  *
  *			[email protected] "math is hard, lets go shopping!"
  */
-static unsigned long cyc2ns_scale;
+static unsigned long cyc2ns_scale __read_mostly;
 
 #define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */
 
arch/x86_64/kernel/time.c +1 -1
Index: linux-2.6.16-rc6mm1/arch/x86_64/kernel/time.c
===================================================================
@@ -467,7 +467,7 @@ static irqreturn_t timer_interrupt(int i
 	return IRQ_HANDLED;
 }
 
-static unsigned int cyc2ns_scale;
+static unsigned int cyc2ns_scale __read_mostly;
 #define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */
 
 static inline void set_cyc2ns_scale(unsigned long cpu_khz)
#1 lore raw
Quoted 3 lines · Ravikiran G Thirumalai

This variable is rarely written to. Mark the variable accordingly

I dropped all John's timekeeping patches today - he's redoing everything. So I've reworked this against mainline.

x86 actually has two cyc2ns_scale's.

 arch/i386/kernel/timers/timer_hpet.c |    2 +-
 arch/i386/kernel/timers/timer_tsc.c  |    2 +-
 arch/x86_64/kernel/time.c            |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/i386/kernel/timers/timer_hpet.c renamed from arch/i386/kernel/timers/timer_hpet.c~mark-cyc2ns_scale-readmostly +1 -1
diff -puN arch/i386/kernel/timers/timer_hpet.c~mark-cyc2ns_scale-readmostly arch/i386/kernel/timers/timer_hpet.c
@@ -46,7 +46,7 @@ static seqlock_t monotonic_lock = SEQLOC
  *
  *			[email protected] "math is hard, lets go shopping!"
  */
-static unsigned long cyc2ns_scale;
+static unsigned long cyc2ns_scale __read_mostly;
 #define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */
 
 static inline void set_cyc2ns_scale(unsigned long cpu_khz)
arch/i386/kernel/timers/timer_tsc.c renamed from arch/i386/kernel/timers/timer_tsc.c~mark-cyc2ns_scale-readmostly +1 -1
diff -puN arch/i386/kernel/timers/timer_tsc.c~mark-cyc2ns_scale-readmostly arch/i386/kernel/timers/timer_tsc.c
@@ -74,7 +74,7 @@ late_initcall(start_lost_tick_compensati
  *
  *			[email protected] "math is hard, lets go shopping!"
  */
-static unsigned long cyc2ns_scale; 
+static unsigned long cyc2ns_scale __read_mostly;
 #define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */
 
 static inline void set_cyc2ns_scale(unsigned long cpu_khz)
arch/x86_64/kernel/time.c renamed from arch/x86_64/kernel/time.c~mark-cyc2ns_scale-readmostly +1 -1
diff -puN arch/x86_64/kernel/time.c~mark-cyc2ns_scale-readmostly arch/x86_64/kernel/time.c
@@ -477,7 +477,7 @@ static irqreturn_t timer_interrupt(int i
 	return IRQ_HANDLED;
 }
 
-static unsigned int cyc2ns_scale;
+static unsigned int cyc2ns_scale __read_mostly;
 #define CYC2NS_SCALE_FACTOR 10 /* 2^10, carefully chosen */
 
 static inline void set_cyc2ns_scale(unsigned long cpu_khz)

_