powerpc: apply recent changes to merged code

Signed-off-by: Paul Mackerras <paulus@samba.org>
2005-10-31 13:57:01 +11:00
parent 23fd07750a
commit 734d652480
6 changed files with 6 additions and 12 deletions
@@ -70,10 +70,6 @@
 #include <asm/iSeries/HvCallXm.h>
 #endif

-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;