[PATCH] jiffies_64 cleanup

Define jiffies_64 in kernel/timer.c rather than having 24 duplicated defines in each architecture.

Thomas Gleixner committed 21 years ago

Commit ecea8d11 parent 371e8c225 files · +4 −93Browse files

Unified · Split

25 files

arch/alpha/kernel/time.c +0 −4
arch/arm/kernel/time.c +0 −4
arch/arm26/kernel/time.c +0 −4
arch/cris/kernel/time.c +0 −4
arch/frv/kernel/time.c +0 −3
arch/h8300/kernel/time.c +0 −4
arch/i386/kernel/time.c +0 −4
arch/ia64/kernel/time.c +0 −4
arch/m32r/kernel/time.c +0 −4
arch/m68k/kernel/time.c +0 −4
arch/m68knommu/kernel/time.c +0 −4
arch/mips/kernel/time.c +0 −4
arch/parisc/kernel/time.c +0 −4
arch/ppc/kernel/time.c +0 −5
arch/ppc64/kernel/time.c +0 −4
arch/s390/kernel/time.c +0 −4
arch/sh/kernel/time.c +0 −4
arch/sh64/kernel/time.c +0 −2
arch/sparc/kernel/time.c +0 −4
arch/sparc64/kernel/time.c +0 −4
arch/um/kernel/time_kern.c +0 −4
arch/v850/kernel/time.c +0 −4
arch/x86_64/kernel/time.c +0 −4
arch/xtensa/kernel/time.c +0 −3
kernel/timer.c +4 −0

@@ -55,10 +55,6 @@ · 54 unmodified lines
55	55	#include "proto.h"
56	56	#include "irq_impl.h"
57	57
58		−u64 jiffies_64 = INITIAL_JIFFIES;
59		−
60		−EXPORT_SYMBOL(jiffies_64);
61		−
62	58	extern unsigned long wall_jiffies; /* kernel/timer.c */
63	59
64	60	static int set_rtc_mmss(unsigned long);

arch/arm/kernel/time.c+0−4

@@ -36,10 +36,6 @@ · 35 unmodified lines
36	36	#include <asm/thread_info.h>
37	37	#include <asm/mach/time.h>
38	38
39		−u64 jiffies_64 = INITIAL_JIFFIES;
40		−
41		−EXPORT_SYMBOL(jiffies_64);
42		−
43	39	/*
44	40	* Our system timer.
45	41	*/

arch/arm26/kernel/time.c+0−4

@@ -34,10 +34,6 @@ · 33 unmodified lines
34	34	#include <asm/irq.h>
35	35	#include <asm/ioc.h>
36	36
37		−u64 jiffies_64 = INITIAL_JIFFIES;
38		−
39		−EXPORT_SYMBOL(jiffies_64);
40		−
41	37	extern unsigned long wall_jiffies;
42	38
43	39	/* this needs a better home */

arch/cris/kernel/time.c+0−4

@@ -32,10 +32,6 @@ · 31 unmodified lines
32	32	#include <linux/init.h>
33	33	#include <linux/profile.h>
34	34
35		−u64 jiffies_64 = INITIAL_JIFFIES;
36		−
37		−EXPORT_SYMBOL(jiffies_64);
38		−
39	35	int have_rtc; /* used to remember if we have an RTC or not */;
40	36
41	37	#define TICK_SIZE tick

arch/frv/kernel/time.c+0−3

@@ -34,9 +34,6 @@ · 33 unmodified lines
34	34
35	35	extern unsigned long wall_jiffies;
36	36
37		−u64 jiffies_64 = INITIAL_JIFFIES;
38		−EXPORT_SYMBOL(jiffies_64);
39		−
40	37	unsigned long __nongprelbss __clkin_clock_speed_HZ;
41	38	unsigned long __nongprelbss __ext_bus_clock_speed_HZ;
42	39	unsigned long __nongprelbss __res_bus_clock_speed_HZ;

arch/h8300/kernel/time.c+0−4

@@ -32,10 +32,6 @@ · 31 unmodified lines
32	32
33	33	#define TICK_SIZE (tick_nsec / 1000)
34	34
35		−u64 jiffies_64;
36		−
37		−EXPORT_SYMBOL(jiffies_64);
38		−
39	35	/*
40	36	* timer_interrupt() needs to keep up the real-time clock,
41	37	* as well as call the "do_timer()" routine every clocktick

arch/i386/kernel/time.c+0−4

@@ -74,10 +74,6 @@ int pit_latch_buggy; /* extern */ · 73 unmodified lines
74	74
75	75	#include "do_timer.h"
76	76
77		−u64 jiffies_64 = INITIAL_JIFFIES;
78		−
79		−EXPORT_SYMBOL(jiffies_64);
80		−
81	77	unsigned int cpu_khz; /* Detected as we calibrate the TSC */
82	78	EXPORT_SYMBOL(cpu_khz);
83	79

arch/ia64/kernel/time.c+0−4

@@ -32,10 +32,6 @@ · 31 unmodified lines
32	32
33	33	extern unsigned long wall_jiffies;
34	34
35		−u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
36		−
37		−EXPORT_SYMBOL(jiffies_64);
38		−
39	35	#define TIME_KEEPER_ID 0 /* smp_processor_id() of time-keeper */
40	36
41	37	#ifdef CONFIG_IA64_DEBUG_IRQ

arch/m32r/kernel/time.c+0−4

@@ -39,10 +39,6 @@ extern void send_IPI_allbutself(int, int); · 38 unmodified lines
39	39	extern void smp_local_timer_interrupt(struct pt_regs *);
40	40	#endif
41	41
42		−u64 jiffies_64 = INITIAL_JIFFIES;
43		−
44		−EXPORT_SYMBOL(jiffies_64);
45		−
46	42	extern unsigned long wall_jiffies;
47	43	#define TICK_SIZE (tick_nsec / 1000)
48	44

arch/m68k/kernel/time.c+0−4

@@ -27,10 +27,6 @@ · 26 unmodified lines
27	27	#include <linux/timex.h>
28	28	#include <linux/profile.h>
29	29
30		−u64 jiffies_64 = INITIAL_JIFFIES;
31		−
32		−EXPORT_SYMBOL(jiffies_64);
33		−
34	30	static inline int set_rtc_mmss(unsigned long nowtime)
35	31	{
36	32	if (mach_set_clock_mmss)

arch/m68knommu/kernel/time.c+0−4

@@ -27,10 +27,6 @@ · 26 unmodified lines
27	27
28	28	#define TICK_SIZE (tick_nsec / 1000)
29	29
30		−u64 jiffies_64 = INITIAL_JIFFIES;
31		−
32		−EXPORT_SYMBOL(jiffies_64);
33		−
34	30	extern unsigned long wall_jiffies;
35	31
36	32

arch/mips/kernel/time.c+0−4

@@ -45,10 +45,6 @@ · 44 unmodified lines
45	45
46	46	#define TICK_SIZE (tick_nsec / 1000)
47	47
48		−u64 jiffies_64 = INITIAL_JIFFIES;
49		−
50		−EXPORT_SYMBOL(jiffies_64);
51		−
52	48	/*
53	49	* forward reference
54	50	*/

arch/parisc/kernel/time.c+0−4

@@ -33,10 +33,6 @@ · 32 unmodified lines
33	33
34	34	#include <linux/timex.h>
35	35
36		−u64 jiffies_64 = INITIAL_JIFFIES;
37		−
38		−EXPORT_SYMBOL(jiffies_64);
39		−
40	36	/* xtime and wall_jiffies keep wall-clock time */
41	37	extern unsigned long wall_jiffies;
42	38

arch/ppc/kernel/time.c+0−5

@@ -66,11 +66,6 @@ · 65 unmodified lines
66	66
67	67	#include <asm/time.h>
68	68
69		−/* XXX false sharing with below? */
70		−u64 jiffies_64 = INITIAL_JIFFIES;
71		−
72		−EXPORT_SYMBOL(jiffies_64);
73		−
74	69	unsigned long disarm_decr[NR_CPUS];
75	70
76	71	extern struct timezone sys_tz;

arch/ppc64/kernel/time.c+0−4

@@ -68,10 +68,6 @@ · 67 unmodified lines
68	68	#include <asm/systemcfg.h>
69	69	#include <asm/firmware.h>
70	70
71		−u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
72		−
73		−EXPORT_SYMBOL(jiffies_64);
74		−
75	71	/* keep track of when we need to update the rtc */
76	72	time_t last_rtc_update;
77	73	extern int piranha_simulator;

arch/s390/kernel/time.c+0−4

@@ -49,10 +49,6 @@ · 48 unmodified lines
49	49
50	50	#define TICK_SIZE tick
51	51
52		−u64 jiffies_64 = INITIAL_JIFFIES;
53		−
54		−EXPORT_SYMBOL(jiffies_64);
55		−
56	52	static ext_int_info_t ext_int_info_cc;
57	53	static u64 init_timer_cc;
58	54	static u64 jiffies_timer_cc;

arch/sh/kernel/time.c+0−4

@@ -56,10 +56,6 @@ extern unsigned long wall_jiffies; · 55 unmodified lines
56	56	#define TICK_SIZE (tick_nsec / 1000)
57	57	DEFINE_SPINLOCK(tmu0_lock);
58	58
59		−u64 jiffies_64 = INITIAL_JIFFIES;
60		−
61		−EXPORT_SYMBOL(jiffies_64);
62		−
63	59	/* XXX: Can we initialize this in a routine somewhere? Dreamcast doesn't want
64	60	* these routines anywhere... */
65	61	#ifdef CONFIG_SH_RTC

arch/sh64/kernel/time.c+0−2

@@ -116,8 +116,6 @@ · 115 unmodified lines
116	116
117	117	extern unsigned long wall_jiffies;
118	118
119		−u64 jiffies_64 = INITIAL_JIFFIES;
120		−
121	119	static unsigned long tmu_base, rtc_base;
122	120	unsigned long cprc_base;
123	121

arch/sparc/kernel/time.c+0−4

@@ -45,10 +45,6 @@ · 44 unmodified lines
45	45
46	46	extern unsigned long wall_jiffies;
47	47
48		−u64 jiffies_64 = INITIAL_JIFFIES;
49		−
50		−EXPORT_SYMBOL(jiffies_64);
51		−
52	48	DEFINE_SPINLOCK(rtc_lock);
53	49	enum sparc_clock_type sp_clock_typ;
54	50	DEFINE_SPINLOCK(mostek_lock);

arch/sparc64/kernel/time.c+0−4

@@ -55,10 +55,6 @@ unsigned long ds1287_regs = 0UL; · 54 unmodified lines
55	55
56	56	extern unsigned long wall_jiffies;
57	57
58		−u64 jiffies_64 = INITIAL_JIFFIES;
59		−
60		−EXPORT_SYMBOL(jiffies_64);
61		−
62	58	static void __iomem *mstk48t08_regs;
63	59	static void __iomem *mstk48t59_regs;
64	60

arch/um/kernel/time_kern.c+0−4

@@ -22,10 +22,6 @@ · 21 unmodified lines
22	22	#include "mode.h"
23	23	#include "os.h"
24	24
25		−u64 jiffies_64 = INITIAL_JIFFIES;
26		−
27		−EXPORT_SYMBOL(jiffies_64);
28		−
29	25	int hz(void)
30	26	{
31	27	return(HZ);

arch/v850/kernel/time.c+0−4

@@ -26,10 +26,6 @@ · 25 unmodified lines
26	26
27	27	#include "mach.h"
28	28
29		−u64 jiffies_64 = INITIAL_JIFFIES;
30		−
31		−EXPORT_SYMBOL(jiffies_64);
32		−
33	29	#define TICK_SIZE (tick_nsec / 1000)
34	30
35	31	/*

arch/x86_64/kernel/time.c+0−4

@@ -42,10 +42,6 @@ · 41 unmodified lines
42	42	#include <asm/apic.h>
43	43	#endif
44	44
45		−u64 jiffies_64 = INITIAL_JIFFIES;
46		−
47		−EXPORT_SYMBOL(jiffies_64);
48		−
49	45	#ifdef CONFIG_CPU_FREQ
50	46	static void cpufreq_delayed_get(void);
51	47	#endif

arch/xtensa/kernel/time.c+0−3

@@ -29,9 +29,6 @@ · 28 unmodified lines
29	29
30	30	extern volatile unsigned long wall_jiffies;
31	31
32		−u64 jiffies_64 = INITIAL_JIFFIES;
33		−EXPORT_SYMBOL(jiffies_64);
34		−
35	32	spinlock_t rtc_lock = SPIN_LOCK_UNLOCKED;
36	33	EXPORT_SYMBOL(rtc_lock);
37	34

kernel/timer.c+4−0

@@ -46,6 +46,10 @@ static void time_interpolator_update(long delta_nsec); · 45 unmodified lines
46	46	#define time_interpolator_update(x)
47	47	#endif
48	48
	49	+u64 jiffies_64 __cacheline_aligned_in_smp = INITIAL_JIFFIES;
	50	+
	51	+EXPORT_SYMBOL(jiffies_64);
	52	+
49	53	/*
50	54	* per-CPU timer vector definitions:
51	55	*/