[SPARC]: Rename private init_timers to sparc{,64}_init_timers.

diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index 265bc70079159df9a6492205ced8e63cbe5aa824..811080b01e90d1c1a63ff6316e885623240bca03 100644 (file)
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -75,7 +75,7 @@ static void irq_panic(void)
     prom_halt();
 }
 
-void (*init_timers)(void (*)(int, void *,struct pt_regs *)) =
+void (*sparc_init_timers)(void (*)(int, void *,struct pt_regs *)) =
     (void (*)(void (*)(int, void *,struct pt_regs *))) irq_panic;
 
 /*

diff --git a/arch/sparc/kernel/sun4c_irq.c b/arch/sparc/kernel/sun4c_irq.c
index e07203067d5a23084e0e630e504f7da08923d3d2..f21c4cacf4f0ffa4241e2b3c478e0e3a2f65e989 100644 (file)
--- a/arch/sparc/kernel/sun4c_irq.c
+++ b/arch/sparc/kernel/sun4c_irq.c
@@ -221,7 +221,7 @@ void __init sun4c_init_IRQ(void)
        BTFIXUPSET_CALL(clear_profile_irq, sun4c_clear_profile_irq, BTFIXUPCALL_NOP);
        BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq, BTFIXUPCALL_NOP);
        BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM);
-       init_timers = sun4c_init_timers;
+       sparc_init_timers = sun4c_init_timers;
 #ifdef CONFIG_SMP
        BTFIXUPSET_CALL(set_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);
        BTFIXUPSET_CALL(clear_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);

diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c
index fdcd32f37e5e78ff1996b6564017a5c838b9487d..6280baf6053931c4cc29f3b5445abd0a4112f941 100644 (file)
--- a/arch/sparc/kernel/sun4m_irq.c
+++ b/arch/sparc/kernel/sun4m_irq.c
@@ -374,7 +374,7 @@ void __init sun4m_init_IRQ(void)
        BTFIXUPSET_CALL(clear_profile_irq, sun4m_clear_profile_irq, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(load_profile_irq, sun4m_load_profile_irq, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM);
-       init_timers = sun4m_init_timers;
+       sparc_init_timers = sun4m_init_timers;
 #ifdef CONFIG_SMP
        BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM);
        BTFIXUPSET_CALL(clear_cpu_int, sun4m_clear_ipi, BTFIXUPCALL_NORM);

diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 395bc29b00344df8c6782be982486b451be008d9..92838fdd77f077e0a4f19a11985d1b3695f666da 100644 (file)
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -386,7 +386,7 @@ void __init sbus_time_init(void)
        else
                clock_probe();
 
-       init_timers(timer_interrupt);
+       sparc_init_timers(timer_interrupt);
        
 #ifdef CONFIG_SUN4
        if(idprom->id_machtype == (SM_SUN4 | SM_4_330)) {

diff --git a/arch/sparc64/kernel/irq.c b/arch/sparc64/kernel/irq.c
index 8c4636557c7225b34ad2750d3cc1f7de55c6d781..c9f1df477fe0ab1226a0a1b1f273c59013fe40c4 100644 (file)
--- a/arch/sparc64/kernel/irq.c
+++ b/arch/sparc64/kernel/irq.c
@@ -950,8 +950,8 @@ int probe_irq_off(unsigned long mask)
 }
 
 /* This is gets the master TICK_INT timer going. */
-void init_timers(void (*cfunc)(int, void *, struct pt_regs *),
-                unsigned long *clock)
+void sparc64_init_timers(void (*cfunc)(int, void *, struct pt_regs *),
+                        unsigned long *clock)
 {
        unsigned long pstate;
        extern unsigned long timer_tick_offset;

diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 20f758eb9978c3d5939b73f2d2a24400caeeb9c0..ef50c8c806b4899d5bba3554be79c8c22385a84b 100644 (file)
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -617,9 +617,6 @@ try_isa_clock:
        local_irq_restore(flags);
 }
 
-extern void init_timers(void (*func)(int, void *, struct pt_regs *),
-                       unsigned long *);
-
 void __init time_init(void)
 {
        /* clock_probe() is now done at end of [se]bus_init on sparc64
@@ -628,7 +625,7 @@ void __init time_init(void)
         */
        unsigned long clock;
 
-       init_timers(timer_interrupt, &clock);
+       sparc64_init_timers(timer_interrupt, &clock);
        timer_ticks_per_usec_quotient = ((1UL<<32) / (clock / 1000020));
 }
 

diff --git a/include/asm-sparc/irq.h b/include/asm-sparc/irq.h
index 0e869326478766710177f43680f1a7d32e2651ae..d3f935afaf8747a14ef9e316d7c15aa2df7a603b 100644 (file)
--- a/include/asm-sparc/irq.h
+++ b/include/asm-sparc/irq.h
@@ -47,7 +47,7 @@ BTFIXUPDEF_CALL(void, load_profile_irq, int, unsigned int)
 #define clear_profile_irq(cpu) BTFIXUP_CALL(clear_profile_irq)(cpu)
 #define load_profile_irq(cpu,limit) BTFIXUP_CALL(load_profile_irq)(cpu,limit)
 
-extern void (*init_timers)(void (*lvl10_irq)(int, void *, struct pt_regs *));
+extern void (*sparc_init_timers)(void (*lvl10_irq)(int, void *, struct pt_regs *));
 extern void claim_ticker14(void (*irq_handler)(int, void *, struct pt_regs *),
                           int irq,
                           unsigned int timeout);

diff --git a/include/asm-sparc64/irq.h b/include/asm-sparc64/irq.h
index 706388a5e3721a4339232fb60b17f1ba720d383e..cebf5b5a99e1d345ddf9fff4b93d7a2f5edeeb90 100644 (file)
--- a/include/asm-sparc64/irq.h
+++ b/include/asm-sparc64/irq.h
@@ -116,8 +116,8 @@ static __inline__ char *__irq_itoa(unsigned int irq)
 extern void disable_irq(unsigned int);
 #define disable_irq_nosync disable_irq
 extern void enable_irq(unsigned int);
-extern void init_timers(void (*lvl10_irq)(int, void *, struct pt_regs *),
-                       unsigned long *);
+extern void sparc64_init_timers(void (*lvl10_irq)(int, void *, struct pt_regs *),
+                               unsigned long *);
 extern unsigned int build_irq(int pil, int inofixup, unsigned long iclr, unsigned long imap);
 extern unsigned int sbus_build_irq(void *sbus, unsigned int ino);
 extern unsigned int psycho_build_irq(void *psycho, int imap_off, int ino, int need_dma_sync);