iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[PATCH] jiffies_64 cleanup

Browse Source 
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>
This commit is contained in:
Thomas Gleixner 2005-10-30 15:03:00 -08:00 committed by Linus Torvalds
parent 371e8c25b6
commit ecea8d19c9
25 changed files with 4 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/alpha/kernel/time.c
View File

@ -55,10 +55,6 @@
#include "proto.h" #include "proto.h"
#include "irq_impl.h" #include "irq_impl.h"
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
extern unsigned long wall_jiffies; /* kernel/timer.c */ extern unsigned long wall_jiffies; /* kernel/timer.c */
static int set_rtc_mmss(unsigned long); static int set_rtc_mmss(unsigned long);

4
arch/arm/kernel/time.c
View File

@ -36,10 +36,6 @@
#include <asm/thread_info.h> #include <asm/thread_info.h>
#include <asm/mach/time.h> #include <asm/mach/time.h>
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
/* /*
* Our system timer. * Our system timer.
*/ */

4
arch/arm26/kernel/time.c
View File

@ -34,10 +34,6 @@
#include <asm/irq.h> #include <asm/irq.h>
#include <asm/ioc.h> #include <asm/ioc.h>
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
extern unsigned long wall_jiffies; extern unsigned long wall_jiffies;
/* this needs a better home */ /* this needs a better home */

4
arch/cris/kernel/time.c
View File

@ -32,10 +32,6 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/profile.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 */; int have_rtc; /* used to remember if we have an RTC or not */;
#define TICK_SIZE tick #define TICK_SIZE tick

3
arch/frv/kernel/time.c
View File

@ -34,9 +34,6 @@
extern unsigned long wall_jiffies; extern unsigned long wall_jiffies;
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
unsigned long __nongprelbss __clkin_clock_speed_HZ; unsigned long __nongprelbss __clkin_clock_speed_HZ;
unsigned long __nongprelbss __ext_bus_clock_speed_HZ; unsigned long __nongprelbss __ext_bus_clock_speed_HZ;
unsigned long __nongprelbss __res_bus_clock_speed_HZ; unsigned long __nongprelbss __res_bus_clock_speed_HZ;

4
arch/h8300/kernel/time.c
View File

@ -32,10 +32,6 @@
#define TICK_SIZE (tick_nsec / 1000) #define TICK_SIZE (tick_nsec / 1000)
u64 jiffies_64;
EXPORT_SYMBOL(jiffies_64);
/* /*
* timer_interrupt() needs to keep up the real-time clock, * timer_interrupt() needs to keep up the real-time clock,
* as well as call the "do_timer()" routine every clocktick * as well as call the "do_timer()" routine every clocktick

4
arch/i386/kernel/time.c
View File

@ -74,10 +74,6 @@ int pit_latch_buggy; /* extern */
#include "do_timer.h" #include "do_timer.h"
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
unsigned int cpu_khz; /* Detected as we calibrate the TSC */ unsigned int cpu_khz; /* Detected as we calibrate the TSC */
EXPORT_SYMBOL(cpu_khz); EXPORT_SYMBOL(cpu_khz);

4
arch/ia64/kernel/time.c
View File

@ -32,10 +32,6 @@
extern unsigned long wall_jiffies; 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 */ #define TIME_KEEPER_ID 0 /* smp_processor_id() of time-keeper */
#ifdef CONFIG_IA64_DEBUG_IRQ #ifdef CONFIG_IA64_DEBUG_IRQ

4
arch/m32r/kernel/time.c
View File

@ -39,10 +39,6 @@ extern void send_IPI_allbutself(int, int);
extern void smp_local_timer_interrupt(struct pt_regs *); extern void smp_local_timer_interrupt(struct pt_regs *);
#endif #endif
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
extern unsigned long wall_jiffies; extern unsigned long wall_jiffies;
#define TICK_SIZE (tick_nsec / 1000) #define TICK_SIZE (tick_nsec / 1000)

4
arch/m68k/kernel/time.c
View File

@ -27,10 +27,6 @@
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/profile.h> #include <linux/profile.h>
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
static inline int set_rtc_mmss(unsigned long nowtime) static inline int set_rtc_mmss(unsigned long nowtime)
{ {
if (mach_set_clock_mmss) if (mach_set_clock_mmss)

4
arch/m68knommu/kernel/time.c
View File

@ -27,10 +27,6 @@
#define TICK_SIZE (tick_nsec / 1000) #define TICK_SIZE (tick_nsec / 1000)
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
extern unsigned long wall_jiffies; extern unsigned long wall_jiffies;

4
arch/mips/kernel/time.c
View File

@ -45,10 +45,6 @@
#define TICK_SIZE (tick_nsec / 1000) #define TICK_SIZE (tick_nsec / 1000)
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
/* /*
* forward reference * forward reference
*/ */

4
arch/parisc/kernel/time.c
View File

@ -33,10 +33,6 @@
#include <linux/timex.h> #include <linux/timex.h>
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
/* xtime and wall_jiffies keep wall-clock time */ /* xtime and wall_jiffies keep wall-clock time */
extern unsigned long wall_jiffies; extern unsigned long wall_jiffies;

5
arch/ppc/kernel/time.c
View File

@ -66,11 +66,6 @@
#include <asm/time.h> #include <asm/time.h>
/* XXX false sharing with below? */
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
unsigned long disarm_decr[NR_CPUS]; unsigned long disarm_decr[NR_CPUS];
extern struct timezone sys_tz; extern struct timezone sys_tz;

4
arch/ppc64/kernel/time.c
View File

@ -68,10 +68,6 @@
#include <asm/systemcfg.h> #include <asm/systemcfg.h>
#include <asm/firmware.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 */ /* keep track of when we need to update the rtc */
time_t last_rtc_update; time_t last_rtc_update;
extern int piranha_simulator; extern int piranha_simulator;

4
arch/s390/kernel/time.c
View File

@ -49,10 +49,6 @@
#define TICK_SIZE tick #define TICK_SIZE tick
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
static ext_int_info_t ext_int_info_cc; static ext_int_info_t ext_int_info_cc;
static u64 init_timer_cc; static u64 init_timer_cc;
static u64 jiffies_timer_cc; static u64 jiffies_timer_cc;

4
arch/sh/kernel/time.c
View File

@ -56,10 +56,6 @@ extern unsigned long wall_jiffies;
#define TICK_SIZE (tick_nsec / 1000) #define TICK_SIZE (tick_nsec / 1000)
DEFINE_SPINLOCK(tmu0_lock); 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 /* XXX: Can we initialize this in a routine somewhere? Dreamcast doesn't want
* these routines anywhere... */ * these routines anywhere... */
#ifdef CONFIG_SH_RTC #ifdef CONFIG_SH_RTC

2
arch/sh64/kernel/time.c
View File

@ -116,8 +116,6 @@
extern unsigned long wall_jiffies; extern unsigned long wall_jiffies;
u64 jiffies_64 = INITIAL_JIFFIES;
static unsigned long tmu_base, rtc_base; static unsigned long tmu_base, rtc_base;
unsigned long cprc_base; unsigned long cprc_base;

4
arch/sparc/kernel/time.c
View File

@ -45,10 +45,6 @@
extern unsigned long wall_jiffies; extern unsigned long wall_jiffies;
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
DEFINE_SPINLOCK(rtc_lock); DEFINE_SPINLOCK(rtc_lock);
enum sparc_clock_type sp_clock_typ; enum sparc_clock_type sp_clock_typ;
DEFINE_SPINLOCK(mostek_lock); DEFINE_SPINLOCK(mostek_lock);

4
arch/sparc64/kernel/time.c
View File

@ -55,10 +55,6 @@ unsigned long ds1287_regs = 0UL;
extern unsigned long wall_jiffies; extern unsigned long wall_jiffies;
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
static void __iomem *mstk48t08_regs; static void __iomem *mstk48t08_regs;
static void __iomem *mstk48t59_regs; static void __iomem *mstk48t59_regs;

4
arch/um/kernel/time_kern.c
View File

@ -22,10 +22,6 @@
#include "mode.h" #include "mode.h"
#include "os.h" #include "os.h"
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
int hz(void) int hz(void)
{ {
return(HZ); return(HZ);

4
arch/v850/kernel/time.c
View File

@ -26,10 +26,6 @@
#include "mach.h" #include "mach.h"
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
#define TICK_SIZE (tick_nsec / 1000) #define TICK_SIZE (tick_nsec / 1000)
/* /*

4
arch/x86_64/kernel/time.c
View File

@ -42,10 +42,6 @@
#include <asm/apic.h> #include <asm/apic.h>
#endif #endif
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
#ifdef CONFIG_CPU_FREQ #ifdef CONFIG_CPU_FREQ
static void cpufreq_delayed_get(void); static void cpufreq_delayed_get(void);
#endif #endif

3
arch/xtensa/kernel/time.c
View File

@ -29,9 +29,6 @@
extern volatile unsigned long wall_jiffies; extern volatile unsigned long wall_jiffies;
u64 jiffies_64 = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED; spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;
EXPORT_SYMBOL(rtc_lock); EXPORT_SYMBOL(rtc_lock);

4
kernel/timer.c
View File

@ -46,6 +46,10 @@ static void time_interpolator_update(long delta_nsec);
#define time_interpolator_update(x) #define time_interpolator_update(x)
#endif #endif
u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
EXPORT_SYMBOL(jiffies_64);
/* /*
* per-CPU timer vector definitions: * per-CPU timer vector definitions:
*/ */