diff options
| author | Paul Mackerras | 2005-10-31 03:57:01 +0100 |
|---|---|---|
| committer | Paul Mackerras | 2005-10-31 03:57:01 +0100 |
| commit | 734d6524800b6a8362666e893a5f3f29b9ef0be9 (patch) | |
| tree | 507fe9acc6fccce31369842d89d86d8dd432dc37 /arch/powerpc/kernel/time.c | |
| parent | Merge ../linux-2.6 by hand (diff) | |
| download | kernel-qcow2-linux-734d6524800b6a8362666e893a5f3f29b9ef0be9.tar.gz kernel-qcow2-linux-734d6524800b6a8362666e893a5f3f29b9ef0be9.tar.xz kernel-qcow2-linux-734d6524800b6a8362666e893a5f3f29b9ef0be9.zip | |
powerpc: apply recent changes to merged code
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/time.c')
| -rw-r--r-- | arch/powerpc/kernel/time.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index ed5c38fb146c..23436b6c1881 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -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; |