Commit 0832a19b authored by David S. Miller's avatar David S. Miller

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

parent 155ee8a0
...@@ -75,7 +75,7 @@ static void irq_panic(void) ...@@ -75,7 +75,7 @@ static void irq_panic(void)
prom_halt(); 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; (void (*)(void (*)(int, void *,struct pt_regs *))) irq_panic;
/* /*
......
...@@ -221,7 +221,7 @@ void __init sun4c_init_IRQ(void) ...@@ -221,7 +221,7 @@ void __init sun4c_init_IRQ(void)
BTFIXUPSET_CALL(clear_profile_irq, sun4c_clear_profile_irq, BTFIXUPCALL_NOP); BTFIXUPSET_CALL(clear_profile_irq, sun4c_clear_profile_irq, BTFIXUPCALL_NOP);
BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq, BTFIXUPCALL_NOP); BTFIXUPSET_CALL(load_profile_irq, sun4c_load_profile_irq, BTFIXUPCALL_NOP);
BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM); BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, BTFIXUPCALL_NORM);
init_timers = sun4c_init_timers; sparc_init_timers = sun4c_init_timers;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
BTFIXUPSET_CALL(set_cpu_int, sun4c_nop, BTFIXUPCALL_NOP); BTFIXUPSET_CALL(set_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);
BTFIXUPSET_CALL(clear_cpu_int, sun4c_nop, BTFIXUPCALL_NOP); BTFIXUPSET_CALL(clear_cpu_int, sun4c_nop, BTFIXUPCALL_NOP);
......
...@@ -374,7 +374,7 @@ void __init sun4m_init_IRQ(void) ...@@ -374,7 +374,7 @@ void __init sun4m_init_IRQ(void)
BTFIXUPSET_CALL(clear_profile_irq, sun4m_clear_profile_irq, BTFIXUPCALL_NORM); BTFIXUPSET_CALL(clear_profile_irq, sun4m_clear_profile_irq, BTFIXUPCALL_NORM);
BTFIXUPSET_CALL(load_profile_irq, sun4m_load_profile_irq, BTFIXUPCALL_NORM); BTFIXUPSET_CALL(load_profile_irq, sun4m_load_profile_irq, BTFIXUPCALL_NORM);
BTFIXUPSET_CALL(__irq_itoa, sun4m_irq_itoa, 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 #ifdef CONFIG_SMP
BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM); BTFIXUPSET_CALL(set_cpu_int, sun4m_send_ipi, BTFIXUPCALL_NORM);
BTFIXUPSET_CALL(clear_cpu_int, sun4m_clear_ipi, BTFIXUPCALL_NORM); BTFIXUPSET_CALL(clear_cpu_int, sun4m_clear_ipi, BTFIXUPCALL_NORM);
......
...@@ -386,7 +386,7 @@ void __init sbus_time_init(void) ...@@ -386,7 +386,7 @@ void __init sbus_time_init(void)
else else
clock_probe(); clock_probe();
init_timers(timer_interrupt); sparc_init_timers(timer_interrupt);
#ifdef CONFIG_SUN4 #ifdef CONFIG_SUN4
if(idprom->id_machtype == (SM_SUN4 | SM_4_330)) { if(idprom->id_machtype == (SM_SUN4 | SM_4_330)) {
......
...@@ -950,7 +950,7 @@ int probe_irq_off(unsigned long mask) ...@@ -950,7 +950,7 @@ int probe_irq_off(unsigned long mask)
} }
/* This is gets the master TICK_INT timer going. */ /* This is gets the master TICK_INT timer going. */
void init_timers(void (*cfunc)(int, void *, struct pt_regs *), void sparc64_init_timers(void (*cfunc)(int, void *, struct pt_regs *),
unsigned long *clock) unsigned long *clock)
{ {
unsigned long pstate; unsigned long pstate;
......
...@@ -617,9 +617,6 @@ void __init clock_probe(void) ...@@ -617,9 +617,6 @@ void __init clock_probe(void)
local_irq_restore(flags); local_irq_restore(flags);
} }
extern void init_timers(void (*func)(int, void *, struct pt_regs *),
unsigned long *);
void __init time_init(void) void __init time_init(void)
{ {
/* clock_probe() is now done at end of [se]bus_init on sparc64 /* clock_probe() is now done at end of [se]bus_init on sparc64
...@@ -628,7 +625,7 @@ void __init time_init(void) ...@@ -628,7 +625,7 @@ void __init time_init(void)
*/ */
unsigned long clock; unsigned long clock;
init_timers(timer_interrupt, &clock); sparc64_init_timers(timer_interrupt, &clock);
timer_ticks_per_usec_quotient = ((1UL<<32) / (clock / 1000020)); timer_ticks_per_usec_quotient = ((1UL<<32) / (clock / 1000020));
} }
......
...@@ -47,7 +47,7 @@ BTFIXUPDEF_CALL(void, load_profile_irq, int, unsigned int) ...@@ -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 clear_profile_irq(cpu) BTFIXUP_CALL(clear_profile_irq)(cpu)
#define load_profile_irq(cpu,limit) BTFIXUP_CALL(load_profile_irq)(cpu,limit) #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 *), extern void claim_ticker14(void (*irq_handler)(int, void *, struct pt_regs *),
int irq, int irq,
unsigned int timeout); unsigned int timeout);
......
...@@ -116,7 +116,7 @@ static __inline__ char *__irq_itoa(unsigned int irq) ...@@ -116,7 +116,7 @@ static __inline__ char *__irq_itoa(unsigned int irq)
extern void disable_irq(unsigned int); extern void disable_irq(unsigned int);
#define disable_irq_nosync disable_irq #define disable_irq_nosync disable_irq
extern void enable_irq(unsigned int); extern void enable_irq(unsigned int);
extern void init_timers(void (*lvl10_irq)(int, void *, struct pt_regs *), extern void sparc64_init_timers(void (*lvl10_irq)(int, void *, struct pt_regs *),
unsigned long *); unsigned long *);
extern unsigned int build_irq(int pil, int inofixup, unsigned long iclr, unsigned long imap); 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 sbus_build_irq(void *sbus, unsigned int ino);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment