提交 ecea8d19 编写于 作者: T Thomas Gleixner 提交者: Linus Torvalds

[PATCH] jiffies_64 cleanup

Define jiffies_64 in kernel/timer.c rather than having 24 duplicated
defines in each architecture.
Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
Signed-off-by: NAndrew Morton <akpm@osdl.org>
Signed-off-by: NLinus Torvalds <torvalds@osdl.org>
上级 371e8c25
......@@ -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);
......
......@@ -36,10 +36,6 @@
#include <asm/thread_info.h>
#include <asm/mach/time.h>
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
/*
* Our system timer.
*/
......
......@@ -34,10 +34,6 @@
#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 */
......
......@@ -32,10 +32,6 @@
#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
......
......@@ -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;
......
......@@ -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
......
......@@ -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);
......
......@@ -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
......
......@@ -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)
......
......@@ -27,10 +27,6 @@
#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)
......
......@@ -27,10 +27,6 @@
#define TICK_SIZE (tick_nsec / 1000)
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
extern unsigned long wall_jiffies;
......
......@@ -45,10 +45,6 @@
#define TICK_SIZE (tick_nsec / 1000)
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
/*
* forward reference
*/
......
......@@ -33,10 +33,6 @@
#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;
......
......@@ -66,11 +66,6 @@
#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;
......
......@@ -68,10 +68,6 @@
#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;
......
......@@ -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;
......
......@@ -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
......
......@@ -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;
......
......@@ -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);
......
......@@ -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;
......
......@@ -22,10 +22,6 @@
#include "mode.h"
#include "os.h"
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
int hz(void)
{
return(HZ);
......
......@@ -26,10 +26,6 @@
#include "mach.h"
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
#define TICK_SIZE (tick_nsec / 1000)
/*
......
......@@ -42,10 +42,6 @@
#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
......
......@@ -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);
......
......@@ -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:
*/
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册