Commit bcf11801 authored by Kevin D. Kissell's avatar Kevin D. Kissell Committed by Ralf Baechle
Browse files

MIPS: SMTC: Fix xxx_clockevent_init() naming conflict for SMTC 



Commit 779e7d41 created a name collision
in SMTC builds.  The attached patch corrects this in a a
not-too-terribly-ugly manner.  Note that the SMTC case has to come
first, because CEVT_R4K will also be true.

Signed-off-by: default avatarKevin D. Kissell <kevink@paralogos.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c34e6e8b

arch/mips/include/asm/time.h

+5 −1
Original line number Diff line number Diff line
@@ -57,7 +57,11 @@ extern int r4k_clockevent_init(void); 


static inline int mips_clockevent_init(void)

{

#ifdef CONFIG_CEVT_R4K

#ifdef CONFIG_MIPS_MT_SMTC

	extern int smtc_clockevent_init(void);



	return smtc_clockevent_init();

#elif CONFIG_CEVT_R4K

	return r4k_clockevent_init();

#else

	return -ENXIO;

arch/mips/kernel/cevt-smtc.c

+1 −1
Original line number Diff line number Diff line
@@ -245,7 +245,7 @@ irqreturn_t c0_compare_interrupt(int irq, void *dev_id) 
}





int __cpuinit mips_clockevent_init(void)

int __cpuinit smtc_clockevent_init(void)

{

	uint64_t mips_freq = mips_hpt_frequency;

	unsigned int cpu = smp_processor_id();

CRA Git | Maintained and supported by SUSTech CRA and CCSE