diff options
-rw-r--r-- | arch/sparc/include/asm/timer_32.h | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4c_irq.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4d_irq.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4m_irq.c | 1 | ||||
-rw-r--r-- | arch/sparc/kernel/time.c | 1 |
5 files changed, 0 insertions, 5 deletions
diff --git a/arch/sparc/include/asm/timer_32.h b/arch/sparc/include/asm/timer_32.h index 351f257eec01..2ec030ef3810 100644 --- a/arch/sparc/include/asm/timer_32.h +++ b/arch/sparc/include/asm/timer_32.h | |||
@@ -12,7 +12,6 @@ | |||
12 | #include <asm/btfixup.h> | 12 | #include <asm/btfixup.h> |
13 | 13 | ||
14 | extern __volatile__ unsigned int *master_l10_counter; | 14 | extern __volatile__ unsigned int *master_l10_counter; |
15 | extern __volatile__ unsigned int *master_l10_limit; | ||
16 | 15 | ||
17 | /* FIXME: Make do_[gs]ettimeofday btfixup calls */ | 16 | /* FIXME: Make do_[gs]ettimeofday btfixup calls */ |
18 | BTFIXUPDEF_CALL(int, bus_do_settimeofday, struct timespec *tv) | 17 | BTFIXUPDEF_CALL(int, bus_do_settimeofday, struct timespec *tv) |
diff --git a/arch/sparc/kernel/sun4c_irq.c b/arch/sparc/kernel/sun4c_irq.c index 92096ba31d58..5dc8a5769489 100644 --- a/arch/sparc/kernel/sun4c_irq.c +++ b/arch/sparc/kernel/sun4c_irq.c | |||
@@ -172,7 +172,6 @@ static void __init sun4c_init_timers(irq_handler_t counter_fn) | |||
172 | sbus_writel((((1000000/HZ) + 1) << 10), &sun4c_timers->l10_limit); | 172 | sbus_writel((((1000000/HZ) + 1) << 10), &sun4c_timers->l10_limit); |
173 | 173 | ||
174 | master_l10_counter = &sun4c_timers->l10_count; | 174 | master_l10_counter = &sun4c_timers->l10_count; |
175 | master_l10_limit = &sun4c_timers->l10_limit; | ||
176 | 175 | ||
177 | err = request_irq(irq[0].pri, counter_fn, | 176 | err = request_irq(irq[0].pri, counter_fn, |
178 | (IRQF_DISABLED | SA_STATIC_ALLOC), | 177 | (IRQF_DISABLED | SA_STATIC_ALLOC), |
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index d376d380ac0a..d3cb76ce418b 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c | |||
@@ -526,7 +526,6 @@ static void __init sun4d_init_timers(irq_handler_t counter_fn) | |||
526 | sbus_writel((((1000000/HZ) + 1) << 10), &sun4d_timers->l10_timer_limit); | 526 | sbus_writel((((1000000/HZ) + 1) << 10), &sun4d_timers->l10_timer_limit); |
527 | 527 | ||
528 | master_l10_counter = &sun4d_timers->l10_cur_count; | 528 | master_l10_counter = &sun4d_timers->l10_cur_count; |
529 | master_l10_limit = &sun4d_timers->l10_timer_limit; | ||
530 | 529 | ||
531 | err = request_irq(TIMER_IRQ, counter_fn, | 530 | err = request_irq(TIMER_IRQ, counter_fn, |
532 | (IRQF_DISABLED | SA_STATIC_ALLOC), | 531 | (IRQF_DISABLED | SA_STATIC_ALLOC), |
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c index ab309eca09c3..c09ec39d68ae 100644 --- a/arch/sparc/kernel/sun4m_irq.c +++ b/arch/sparc/kernel/sun4m_irq.c | |||
@@ -303,7 +303,6 @@ static void __init sun4m_init_timers(irq_handler_t counter_fn) | |||
303 | sbus_writel((((1000000/HZ) + 1) << 10), &timers_global->l10_limit); | 303 | sbus_writel((((1000000/HZ) + 1) << 10), &timers_global->l10_limit); |
304 | 304 | ||
305 | master_l10_counter = &timers_global->l10_count; | 305 | master_l10_counter = &timers_global->l10_count; |
306 | master_l10_limit = &timers_global->l10_limit; | ||
307 | 306 | ||
308 | err = request_irq(TIMER_IRQ, counter_fn, | 307 | err = request_irq(TIMER_IRQ, counter_fn, |
309 | (IRQF_DISABLED | SA_STATIC_ALLOC), "timer", NULL); | 308 | (IRQF_DISABLED | SA_STATIC_ALLOC), "timer", NULL); |
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c index fa54d585f558..62c1d94cb434 100644 --- a/arch/sparc/kernel/time.c +++ b/arch/sparc/kernel/time.c | |||
@@ -73,7 +73,6 @@ unsigned long profile_pc(struct pt_regs *regs) | |||
73 | EXPORT_SYMBOL(profile_pc); | 73 | EXPORT_SYMBOL(profile_pc); |
74 | 74 | ||
75 | __volatile__ unsigned int *master_l10_counter; | 75 | __volatile__ unsigned int *master_l10_counter; |
76 | __volatile__ unsigned int *master_l10_limit; | ||
77 | 76 | ||
78 | /* | 77 | /* |
79 | * timer_interrupt() needs to keep up the real-time clock, | 78 | * timer_interrupt() needs to keep up the real-time clock, |