Merge ../linux-2.6 by hand
[linux-2.6.git] / arch / ppc / kernel / time.c
index 76f44ce4772ec05ea8b3dd4818983204a4b00a56..53ea723af60aa5fff91a1ff057986584098f7285 100644 (file)
 
 #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];
 
 extern struct timezone sys_tz;
 unsigned long disarm_decr[NR_CPUS];
 
 extern struct timezone sys_tz;