From: Thomas Gleixner Define jiffies_64 in kernel/timer.c rather than having 24 duplicated defines in each architecture. Signed-off-by: Thomas Gleixner Signed-off-by: Andrew Morton --- arch/alpha/kernel/time.c | 4 ---- arch/arm/kernel/time.c | 4 ---- arch/arm26/kernel/time.c | 4 ---- arch/cris/kernel/time.c | 4 ---- arch/frv/kernel/time.c | 3 --- arch/h8300/kernel/time.c | 4 ---- arch/i386/kernel/time.c | 4 ---- arch/ia64/kernel/time.c | 4 ---- arch/m32r/kernel/time.c | 4 ---- arch/m68k/kernel/time.c | 4 ---- arch/m68knommu/kernel/time.c | 4 ---- arch/mips/kernel/time.c | 4 ---- arch/parisc/kernel/time.c | 4 ---- arch/ppc/kernel/time.c | 5 ----- arch/ppc64/kernel/time.c | 4 ---- arch/s390/kernel/time.c | 4 ---- arch/sh/kernel/time.c | 4 ---- arch/sh64/kernel/time.c | 2 -- arch/sparc/kernel/time.c | 4 ---- arch/sparc64/kernel/time.c | 4 ---- arch/um/kernel/time_kern.c | 4 ---- arch/v850/kernel/time.c | 4 ---- arch/x86_64/kernel/time.c | 4 ---- arch/xtensa/kernel/time.c | 3 --- kernel/timer.c | 4 ++++ 25 files changed, 4 insertions(+), 93 deletions(-) diff -puN arch/alpha/kernel/time.c~jiffies_64-cleanup arch/alpha/kernel/time.c --- 25/arch/alpha/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:14 2005 +++ 25-akpm/arch/alpha/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -55,10 +55,6 @@ #include "proto.h" #include "irq_impl.h" -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - extern unsigned long wall_jiffies; /* kernel/timer.c */ static int set_rtc_mmss(unsigned long); diff -puN arch/arm26/kernel/time.c~jiffies_64-cleanup arch/arm26/kernel/time.c --- 25/arch/arm26/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:14 2005 +++ 25-akpm/arch/arm26/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -34,10 +34,6 @@ #include #include -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - extern unsigned long wall_jiffies; /* this needs a better home */ diff -puN arch/arm/kernel/time.c~jiffies_64-cleanup arch/arm/kernel/time.c --- 25/arch/arm/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:14 2005 +++ 25-akpm/arch/arm/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -36,10 +36,6 @@ #include #include -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - /* * Our system timer. */ diff -puN arch/cris/kernel/time.c~jiffies_64-cleanup arch/cris/kernel/time.c --- 25/arch/cris/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:14 2005 +++ 25-akpm/arch/cris/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -32,10 +32,6 @@ #include #include -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - int have_rtc; /* used to remember if we have an RTC or not */; #define TICK_SIZE tick diff -puN arch/frv/kernel/time.c~jiffies_64-cleanup arch/frv/kernel/time.c --- 25/arch/frv/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:14 2005 +++ 25-akpm/arch/frv/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -34,9 +34,6 @@ extern unsigned long wall_jiffies; -u64 jiffies_64 = INITIAL_JIFFIES; -EXPORT_SYMBOL(jiffies_64); - unsigned long __nongprelbss __clkin_clock_speed_HZ; unsigned long __nongprelbss __ext_bus_clock_speed_HZ; unsigned long __nongprelbss __res_bus_clock_speed_HZ; diff -puN arch/h8300/kernel/time.c~jiffies_64-cleanup arch/h8300/kernel/time.c --- 25/arch/h8300/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:14 2005 +++ 25-akpm/arch/h8300/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -32,10 +32,6 @@ #define TICK_SIZE (tick_nsec / 1000) -u64 jiffies_64; - -EXPORT_SYMBOL(jiffies_64); - /* * timer_interrupt() needs to keep up the real-time clock, * as well as call the "do_timer()" routine every clocktick diff -puN arch/i386/kernel/time.c~jiffies_64-cleanup arch/i386/kernel/time.c --- 25/arch/i386/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:14 2005 +++ 25-akpm/arch/i386/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -74,10 +74,6 @@ int pit_latch_buggy; /* ext #include "do_timer.h" -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - unsigned int cpu_khz; /* Detected as we calibrate the TSC */ EXPORT_SYMBOL(cpu_khz); diff -puN arch/ia64/kernel/time.c~jiffies_64-cleanup arch/ia64/kernel/time.c --- 25/arch/ia64/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:14 2005 +++ 25-akpm/arch/ia64/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -32,10 +32,6 @@ extern unsigned long wall_jiffies; -u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - #define TIME_KEEPER_ID 0 /* smp_processor_id() of time-keeper */ #ifdef CONFIG_IA64_DEBUG_IRQ diff -puN arch/m32r/kernel/time.c~jiffies_64-cleanup arch/m32r/kernel/time.c --- 25/arch/m32r/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:14 2005 +++ 25-akpm/arch/m32r/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -39,10 +39,6 @@ extern void send_IPI_allbutself(int, int extern void smp_local_timer_interrupt(struct pt_regs *); #endif -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - extern unsigned long wall_jiffies; #define TICK_SIZE (tick_nsec / 1000) diff -puN arch/m68k/kernel/time.c~jiffies_64-cleanup arch/m68k/kernel/time.c --- 25/arch/m68k/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:14 2005 +++ 25-akpm/arch/m68k/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -27,10 +27,6 @@ #include #include -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - static inline int set_rtc_mmss(unsigned long nowtime) { if (mach_set_clock_mmss) diff -puN arch/m68knommu/kernel/time.c~jiffies_64-cleanup arch/m68knommu/kernel/time.c --- 25/arch/m68knommu/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:14 2005 +++ 25-akpm/arch/m68knommu/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -27,10 +27,6 @@ #define TICK_SIZE (tick_nsec / 1000) -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - extern unsigned long wall_jiffies; diff -puN arch/mips/kernel/time.c~jiffies_64-cleanup arch/mips/kernel/time.c --- 25/arch/mips/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/mips/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -43,10 +43,6 @@ #define TICK_SIZE (tick_nsec / 1000) -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - /* * forward reference */ diff -puN arch/parisc/kernel/time.c~jiffies_64-cleanup arch/parisc/kernel/time.c --- 25/arch/parisc/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/parisc/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -33,10 +33,6 @@ #include -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - /* xtime and wall_jiffies keep wall-clock time */ extern unsigned long wall_jiffies; diff -puN arch/ppc64/kernel/time.c~jiffies_64-cleanup arch/ppc64/kernel/time.c --- 25/arch/ppc64/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/ppc64/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -68,10 +68,6 @@ #include #include -u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - /* keep track of when we need to update the rtc */ time_t last_rtc_update; extern int piranha_simulator; diff -puN arch/ppc/kernel/time.c~jiffies_64-cleanup arch/ppc/kernel/time.c --- 25/arch/ppc/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/ppc/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -66,11 +66,6 @@ #include -/* XXX false sharing with below? */ -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - unsigned long disarm_decr[NR_CPUS]; extern struct timezone sys_tz; diff -puN arch/s390/kernel/time.c~jiffies_64-cleanup arch/s390/kernel/time.c --- 25/arch/s390/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/s390/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -49,10 +49,6 @@ #define TICK_SIZE tick -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - static ext_int_info_t ext_int_info_cc; static u64 init_timer_cc; static u64 jiffies_timer_cc; diff -puN arch/sh64/kernel/time.c~jiffies_64-cleanup arch/sh64/kernel/time.c --- 25/arch/sh64/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/sh64/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -116,8 +116,6 @@ extern unsigned long wall_jiffies; -u64 jiffies_64 = INITIAL_JIFFIES; - static unsigned long tmu_base, rtc_base; unsigned long cprc_base; diff -puN arch/sh/kernel/time.c~jiffies_64-cleanup arch/sh/kernel/time.c --- 25/arch/sh/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/sh/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -56,10 +56,6 @@ extern unsigned long wall_jiffies; #define TICK_SIZE (tick_nsec / 1000) DEFINE_SPINLOCK(tmu0_lock); -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - /* XXX: Can we initialize this in a routine somewhere? Dreamcast doesn't want * these routines anywhere... */ #ifdef CONFIG_SH_RTC diff -puN arch/sparc64/kernel/time.c~jiffies_64-cleanup arch/sparc64/kernel/time.c --- 25/arch/sparc64/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/sparc64/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -55,10 +55,6 @@ unsigned long ds1287_regs = 0UL; extern unsigned long wall_jiffies; -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - static void __iomem *mstk48t08_regs; static void __iomem *mstk48t59_regs; diff -puN arch/sparc/kernel/time.c~jiffies_64-cleanup arch/sparc/kernel/time.c --- 25/arch/sparc/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/sparc/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -45,10 +45,6 @@ extern unsigned long wall_jiffies; -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - DEFINE_SPINLOCK(rtc_lock); enum sparc_clock_type sp_clock_typ; DEFINE_SPINLOCK(mostek_lock); diff -puN arch/um/kernel/time_kern.c~jiffies_64-cleanup arch/um/kernel/time_kern.c --- 25/arch/um/kernel/time_kern.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/um/kernel/time_kern.c Fri Oct 14 14:26:15 2005 @@ -22,10 +22,6 @@ #include "mode.h" #include "os.h" -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - int hz(void) { return(HZ); diff -puN arch/v850/kernel/time.c~jiffies_64-cleanup arch/v850/kernel/time.c --- 25/arch/v850/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/v850/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -26,10 +26,6 @@ #include "mach.h" -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - #define TICK_SIZE (tick_nsec / 1000) /* diff -puN arch/x86_64/kernel/time.c~jiffies_64-cleanup arch/x86_64/kernel/time.c --- 25/arch/x86_64/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/x86_64/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -43,10 +43,6 @@ #include #endif -u64 jiffies_64 = INITIAL_JIFFIES; - -EXPORT_SYMBOL(jiffies_64); - #ifdef CONFIG_CPU_FREQ static void cpufreq_delayed_get(void); #endif diff -puN arch/xtensa/kernel/time.c~jiffies_64-cleanup arch/xtensa/kernel/time.c --- 25/arch/xtensa/kernel/time.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/arch/xtensa/kernel/time.c Fri Oct 14 14:26:15 2005 @@ -29,9 +29,6 @@ extern volatile unsigned long wall_jiffies; -u64 jiffies_64 = INITIAL_JIFFIES; -EXPORT_SYMBOL(jiffies_64); - spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED; EXPORT_SYMBOL(rtc_lock); diff -puN kernel/timer.c~jiffies_64-cleanup kernel/timer.c --- 25/kernel/timer.c~jiffies_64-cleanup Fri Oct 14 14:26:15 2005 +++ 25-akpm/kernel/timer.c Fri Oct 14 14:26:15 2005 @@ -46,6 +46,10 @@ static void time_interpolator_update(lon #define time_interpolator_update(x) #endif +u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES; + +EXPORT_SYMBOL(jiffies_64); + /* * per-CPU timer vector definitions: */ _