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/m32r/kernel/time.c | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'arch/m32r/kernel/time.c')
| -rw-r--r-- | arch/m32r/kernel/time.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c index 539c562cd54d..2ebce2063fea 100644 --- a/arch/m32r/kernel/time.c +++ b/arch/m32r/kernel/time.c | |||
| @@ -39,10 +39,6 @@ extern void send_IPI_allbutself(int, int); | |||
| 39 | extern void smp_local_timer_interrupt(struct pt_regs *); | 39 | extern void smp_local_timer_interrupt(struct pt_regs *); |
| 40 | #endif | 40 | #endif |
| 41 | 41 | ||
| 42 | u64 jiffies_64 = INITIAL_JIFFIES; | ||
| 43 | |||
| 44 | EXPORT_SYMBOL(jiffies_64); | ||
| 45 | |||
| 46 | extern unsigned long wall_jiffies; | 42 | extern unsigned long wall_jiffies; |
| 47 | #define TICK_SIZE (tick_nsec / 1000) | 43 | #define TICK_SIZE (tick_nsec / 1000) |
| 48 | 44 | ||