From: Andrew Morton <akpm@osdl.org>

Cc: Eugene Surovegin <ebs@ebshome.net>
Cc: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 kernel/timer.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN kernel/timer.c~timer-initialisation-fix-tidy kernel/timer.c
--- devel/kernel/timer.c~timer-initialisation-fix-tidy	2006-04-01 14:10:36.000000000 -0800
+++ devel-akpm/kernel/timer.c	2006-04-01 14:10:36.000000000 -0800
@@ -85,7 +85,6 @@ typedef struct tvec_t_base_s tvec_base_t
 tvec_base_t boot_tvec_bases;
 EXPORT_SYMBOL(boot_tvec_bases);
 static DEFINE_PER_CPU(tvec_base_t *, tvec_bases) = { &boot_tvec_bases };
-static char tvec_base_done[NR_CPUS];
 
 static inline void set_running_timer(tvec_base_t *base,
 					struct timer_list *timer)
@@ -1226,6 +1225,7 @@ static int __devinit init_timers_cpu(int
 {
 	int j;
 	tvec_base_t *base;
+	static char __devinitdata tvec_base_done[NR_CPUS];
 
 	if (!tvec_base_done[cpu]) {
 		static char boot_done;
_