[PATCH] Move jiffies_64 down into architectures

x86-64 needs an own special declaration of jiffies_64.

prepare for this by moving the jiffies_64 declaration from
kernel/timer.c down into each architecture.

diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
index 0be250e543e81ded9cce980c5f8ffab73f08b5f2..93a569828d70669dad47fdd7334f42176f31d25e 100644 (file)
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
@@ -48,6 +48,8 @@
 #include "proto.h"
 #include "irq_impl.h"
 
+u64 jiffies_64;
+
 extern rwlock_t xtime_lock;
 extern unsigned long wall_jiffies;     /* kernel/timer.c */
 

diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 7c7e03c5b6e94d385073c4c276be7a28a77b8921..cd00aacc74a9f0cde0b630038fb8d47224ef3500 100644 (file)
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -32,6 +32,8 @@
 #include <asm/irq.h>
 #include <asm/leds.h>
 
+u64 jiffies_64;
+
 extern rwlock_t xtime_lock;
 extern unsigned long wall_jiffies;
 

diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c
index 537040f95a6dd870d6805154d6f2da21fd8238da..1ee0bbfeab7e59e09ceba045229c104767ac6e85 100644 (file)
--- a/arch/cris/kernel/time.c
+++ b/arch/cris/kernel/time.c
@@ -44,6 +44,8 @@
 
 #include <asm/svinto.h>
 
+u64 jiffies_64;
+
 static int have_rtc;  /* used to remember if we have an RTC or not */
 
 /* define this if you need to use print_timestamp */

diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 1e1eb0d3a5f7d446425b8623939ba50587f50ee6..f562515135818e4bbb7c53f621230fe3c3a478e2 100644 (file)
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -65,6 +65,7 @@
  */
 #include <linux/irq.h>
 
+u64 jiffies_64;
 
 unsigned long cpu_khz; /* Detected as we calibrate the TSC */
 

diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index dc6500b7a1676ada3120be0bd74951d207b4f017..1c348cce1fddf57d11261a66d462a00e149f04ec 100644 (file)
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -27,6 +27,8 @@ extern rwlock_t xtime_lock;
 extern unsigned long wall_jiffies;
 extern unsigned long last_time_offset;
 
+u64 jiffies_64;
+
 #ifdef CONFIG_IA64_DEBUG_IRQ
 
 unsigned long last_cli_ip;

diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index a845040b339a3a598cc34ffb6cd2c8ecb11c006e..54b8f68cf7e07a0a7c424c87baf9bd9df8601cc4 100644 (file)
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -24,6 +24,7 @@
 
 #include <linux/timex.h>
 
+u64 jiffies_64;
 
 static inline int set_rtc_mmss(unsigned long nowtime)
 {

diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index e548314773dea0db0c864866714a6cd497a094a1..6ea186b42155d319cc17b263d422436c79348c45 100644 (file)
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -32,6 +32,8 @@
 #define USECS_PER_JIFFY (1000000/HZ)
 #define USECS_PER_JIFFY_FRAC ((1000000ULL << 32) / HZ & 0xffffffff)
 
+u64 jiffies_64;
+
 /*
  * forward reference
  */

diff --git a/arch/mips64/kernel/syscall.c b/arch/mips64/kernel/syscall.c
index 6daab491059b797849d395263b245d6c14f66f25..053051c63a25e02092d7b46468ec4879c293fb6a 100644 (file)
--- a/arch/mips64/kernel/syscall.c
+++ b/arch/mips64/kernel/syscall.c
@@ -32,6 +32,8 @@
 #include <asm/sysmips.h>
 #include <asm/uaccess.h>
 
+u64 jiffies_64;
+
 extern asmlinkage void syscall_trace(void);
 
 asmlinkage int sys_pipe(abi64_no_regargs, struct pt_regs regs)

diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 7b3de0e0ada37722e093000ca73f66e51da153c7..e028e6f3dbe2011e04ea96fbf2570434bf6f5d99 100644 (file)
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -30,6 +30,8 @@
 
 #include <linux/timex.h>
 
+u64 jiffies_64;
+
 extern rwlock_t xtime_lock;
 
 static int timer_value;

diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c
index 26034522602211fb301089c8746b13ddabce7b57..88a4d63ffea0b573eaee36273a99a607c360b93c 100644 (file)
--- a/arch/ppc/kernel/time.c
+++ b/arch/ppc/kernel/time.c
@@ -70,6 +70,9 @@
 
 #include <asm/time.h>
 
+/* XXX false sharing with below? */
+u64 jiffies_64;
+
 unsigned long disarm_decr[NR_CPUS];
 
 extern int do_sys_settimeofday(struct timeval *tv, struct timezone *tz);

diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c
index d00224a05633ee4fc62e1cb00756daa46dd96639..9cd390d65342f133f4257ab961cd06668a509a3e 100644 (file)
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
@@ -64,6 +64,8 @@
 
 void smp_local_timer_interrupt(struct pt_regs *);
 
+u64 jiffies_64;
+
 /* keep track of when we need to update the rtc */
 time_t last_rtc_update;
 extern rwlock_t xtime_lock;

diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 2a135d999830ead1034e667b633ef58b2b220b89..f09059ee63bd723f4aec1852c5423dd66aa44e7d 100644 (file)
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -39,6 +39,8 @@
 
 #define TICK_SIZE tick
 
+u64 jiffies_64;
+
 static ext_int_info_t ext_int_info_timer;
 static uint64_t init_timer_cc;
 

diff --git a/arch/s390x/kernel/time.c b/arch/s390x/kernel/time.c
index e12e41e2eaef4dd76efbb60b687a27aa462cad28..b81dcb9683d7a221921052db2e5cd3b65925995e 100644 (file)
--- a/arch/s390x/kernel/time.c
+++ b/arch/s390x/kernel/time.c
@@ -39,6 +39,8 @@
 
 #define TICK_SIZE tick
 
+u64 jiffies_64;
+
 static ext_int_info_t ext_int_info_timer;
 static uint64_t init_timer_cc;
 

diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index 62af96d4fd4802616316db07d4b279dcc5e57901..e51e0eb001d64741db28cb91ed63f5961f0c3fde 100644 (file)
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -70,6 +70,8 @@
 #endif /* CONFIG_CPU_SUBTYPE_ST40STB1 */
 #endif /* __sh3__ or __SH4__ */
 
+u64 jiffies_64;
+
 extern rwlock_t xtime_lock;
 extern unsigned long wall_jiffies;
 #define TICK_SIZE tick

diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 6e7935ab7c56b34e5f256f31b21716e08f05ce97..90d3e8528358ae4414e1184336d2787a61a01864 100644 (file)
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -43,6 +43,8 @@
 
 extern rwlock_t xtime_lock;
 
+u64 jiffies_64;
+
 enum sparc_clock_type sp_clock_typ;
 spinlock_t mostek_lock = SPIN_LOCK_UNLOCKED;
 unsigned long mstk48t02_regs = 0UL;

diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 852c96d62319c656c4f530e11b6559db1505e4fe..47c794e99f4b02283219fb1071eac5aed3577322 100644 (file)
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -44,6 +44,8 @@ unsigned long mstk48t02_regs = 0UL;
 unsigned long ds1287_regs = 0UL;
 #endif
 
+u64 jiffies_64;
+
 static unsigned long mstk48t08_regs = 0UL;
 static unsigned long mstk48t59_regs = 0UL;
 

diff --git a/kernel/timer.c b/kernel/timer.c
index 0b7efa84970b3c304034c13f772da4cdf2b6c628..c6d6d12e04d45d4d77b51556822db7c81190070a 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -69,11 +69,11 @@ unsigned long event;
 extern int do_setitimer(int, struct itimerval *, struct itimerval *);
 
 /*
- * The 64-bit value is not volatile - you MUST NOT read it
+ * The 64-bit jiffies value is not atomic - you MUST NOT read it
  * without holding read_lock_irq(&xtime_lock).
  * jiffies is defined in the linker script...
  */
-u64 jiffies_64;
+
 
 unsigned int * prof_buffer;
 unsigned long prof_len;