]> err.no Git - linux-2.6/commitdiff
[PATCH] jiffies_64 cleanup
authorThomas Gleixner <tglx@linutronix.de>
Sun, 30 Oct 2005 23:03:00 +0000 (15:03 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 31 Oct 2005 01:37:25 +0000 (17:37 -0800)
Define jiffies_64 in kernel/timer.c rather than having 24 duplicated
defines in each architecture.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
25 files changed:
arch/alpha/kernel/time.c
arch/arm/kernel/time.c
arch/arm26/kernel/time.c
arch/cris/kernel/time.c
arch/frv/kernel/time.c
arch/h8300/kernel/time.c
arch/i386/kernel/time.c
arch/ia64/kernel/time.c
arch/m32r/kernel/time.c
arch/m68k/kernel/time.c
arch/m68knommu/kernel/time.c
arch/mips/kernel/time.c
arch/parisc/kernel/time.c
arch/ppc/kernel/time.c
arch/ppc64/kernel/time.c
arch/s390/kernel/time.c
arch/sh/kernel/time.c
arch/sh64/kernel/time.c
arch/sparc/kernel/time.c
arch/sparc64/kernel/time.c
arch/um/kernel/time_kern.c
arch/v850/kernel/time.c
arch/x86_64/kernel/time.c
arch/xtensa/kernel/time.c
kernel/timer.c

index 67be50b7d80afba730e18746ad8e8ac63acc6068..6b2921be19090c9a5a0a6a85a87f4e6d525ff258 100644 (file)
 #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);
index 69449a818dccecd78ac290032124c9998e746d4a..fc4729106a3262cd4709f8f822673952205098c8 100644 (file)
 #include <asm/thread_info.h>
 #include <asm/mach/time.h>
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 /*
  * Our system timer.
  */
index e66aedd02fad7c2eccf15259efb97c162e3dec5a..335525339ad6f4e107689ca26d047eb7b4a89330 100644 (file)
 #include <asm/irq.h>
 #include <asm/ioc.h>
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 extern unsigned long wall_jiffies;
 
 /* this needs a better home */
index a2d99b4aedcda34f22a5c1ec10fc4f3250050b0c..b863815de78d7884d664ad3f3f2b19855ac3b66e 100644 (file)
 #include <linux/init.h>
 #include <linux/profile.h>
 
-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
index f43b734482e3aea84c5de5547f3ab31d102f6470..2e9741227b739161bd57b5f4b2d47593971da0b2 100644 (file)
@@ -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;
index af8c5d2057dd56ed6fa30257cd9ab2cd5c521bcb..688a5100604c943c614e5ffeb8fef25ba5c9b2fd 100644 (file)
 
 #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
index 46c35ec9137dd986231e8f17fb5ba9348eba1d29..07471bba2dc6a7d10b28a09ef0c2ae119444f797 100644 (file)
@@ -74,10 +74,6 @@ int pit_latch_buggy;              /* extern */
 
 #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);
 
index 8b8a5a45b621cffed8fb384e5e272c0fdd1a8ecb..5b7e736f3b4924beb5e779a92b3c93a7f2a606f2 100644 (file)
 
 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
index 539c562cd54de57b04eb45f59ea5bea9fc3f0012..2ebce2063fea3038d4875db603b5ebd72d8758ae 100644 (file)
@@ -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)
 
index 4ec95e3cb8748721ec6b37880d0a87aaf1b55f83..98e4b1adfa29f3836cf69ddd339f02017669bff5 100644 (file)
 #include <linux/timex.h>
 #include <linux/profile.h>
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 static inline int set_rtc_mmss(unsigned long nowtime)
 {
   if (mach_set_clock_mmss)
index b17c1ecba966e103d36ad2f7108b4c28a16d2b1a..b9d8abb454301cb0a5b4081e67f49dfb4fb96ad2 100644 (file)
 
 #define        TICK_SIZE (tick_nsec / 1000)
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 extern unsigned long wall_jiffies;
 
 
index a24651dfaaba773b9c63a7476c5986292b73daa2..787ed541d442b2449947825dbdd480d55b6d80bf 100644 (file)
 
 #define TICK_SIZE      (tick_nsec / 1000)
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 /*
  * forward reference
  */
index bc979e1abdec4dbc936a715354b1f5b93f1aa43e..cded2568078741c3177f56b23ef64a3e4a9d2488 100644 (file)
 
 #include <linux/timex.h>
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 /* xtime and wall_jiffies keep wall-clock time */
 extern unsigned long wall_jiffies;
 
index 22d7fd1e0aea7e4e86851db796699ffa3c8f9bee..67797184f4eb3f99e9ae35147f8d6e438233997d 100644 (file)
 
 #include <asm/time.h>
 
-/* 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;
index b56c6a324e17f9c2b612ea1bebe0bbb62e2a5c69..ab565468578a4c6bd1db3c4d473036803963ffb4 100644 (file)
 #include <asm/systemcfg.h>
 #include <asm/firmware.h>
 
-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;
index 2fd75da1549522b13816e9a9c50e1be8c4db2b42..9a1d95894f3df95e8201f210894ab88dcf651e07 100644 (file)
 
 #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;
index 02ca69918d7c0992a943f7d7d856149f0145a9a3..671b876416bf184a1b66554547802bfc219aa52f 100644 (file)
@@ -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
index 43e395a14f490b8f3d6252d930747f55020c2bcc..870fe5327e09490b43c4d63c706b24de15402798 100644 (file)
 
 extern unsigned long wall_jiffies;
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
 static unsigned long tmu_base, rtc_base;
 unsigned long cprc_base;
 
index 279a62627c109906d7286f14d96659c7ffa0683a..24814d58f9e10363569ac0a8e3a254c3de111288 100644 (file)
 
 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);
index 3f08a32f51a16d2a91231ddcf15701dbdbe3d51b..38c5525087a2149c0c921a51c1fe64a5b2c4f7fa 100644 (file)
@@ -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;
 
index 4e08f7545d63d6df96558ff6506a764db1b7e4ca..020ca79b8d33200b3c6f4c29c582e4528cf5a00b 100644 (file)
 #include "mode.h"
 #include "os.h"
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 int hz(void)
 {
        return(HZ);
index ea3fd8844ff06b1bc4df01188db13407def7b833..c1e85c2aef65093f0ae70c90d8f1efc893e1e1b3 100644 (file)
 
 #include "mach.h"
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 #define TICK_SIZE      (tick_nsec / 1000)
 
 /*
index 47d25ad08160bc7646d481996b414203ddc0c315..bd5ea09bfdf9fc2d39dd153c162729574219fce9 100644 (file)
 #include <asm/apic.h>
 #endif
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 #ifdef CONFIG_CPU_FREQ
 static void cpufreq_delayed_get(void);
 #endif
index 8e423d1335cee107ad8918710f5bbe3386fc440b..cb6e38ed2b1dfc26ed03963cea0be6f37fc71480 100644 (file)
@@ -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);
 
index 562d53eabb46ecac9e6dc19abd9b5d00bb86cb69..fd74268d8663ca8734814f175c1f0735d020d7a0 100644 (file)
@@ -46,6 +46,10 @@ static void time_interpolator_update(long delta_nsec);
 #define time_interpolator_update(x)
 #endif
 
+u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
+
+EXPORT_SYMBOL(jiffies_64);
+
 /*
  * per-CPU timer vector definitions:
  */