diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /arch/ppc/kernel/time.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/ppc/kernel/time.c')
| -rw-r--r-- | arch/ppc/kernel/time.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c index 76f44ce4772e..53ea723af60a 100644 --- a/arch/ppc/kernel/time.c +++ b/arch/ppc/kernel/time.c | |||
| @@ -66,11 +66,6 @@ | |||
| 66 | 66 | ||
| 67 | #include <asm/time.h> | 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 | unsigned long disarm_decr[NR_CPUS]; | 69 | unsigned long disarm_decr[NR_CPUS]; |
| 75 | 70 | ||
| 76 | extern struct timezone sys_tz; | 71 | extern struct timezone sys_tz; |