Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-alpha-akpm/kernel/timer.c |    3 +--
 1 files changed, 1 insertion(+), 2 deletions(-)

diff -puN kernel/timer.c~timers-fixes-improvements-smp_processor_id-fix kernel/timer.c
--- 25-alpha/kernel/timer.c~timers-fixes-improvements-smp_processor_id-fix	2005-04-02 02:08:02.000000000 -0800
+++ 25-alpha-akpm/kernel/timer.c	2005-04-02 02:08:16.000000000 -0800
@@ -172,8 +172,7 @@ EXPORT_SYMBOL(__init_timer_base);
 void fastcall init_timer(struct timer_list *timer)
 {
 	timer->entry.next = NULL;
-	timer->_base = &per_cpu(tvec_bases,
-			__smp_processor_id()).t_base;
+	timer->_base = &per_cpu(tvec_bases, _smp_processor_id()).t_base;
 	timer->magic = TIMER_MAGIC;
 }
 EXPORT_SYMBOL(init_timer);
_