Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit abde710c authored by Marc Zyngier's avatar Marc Zyngier
Browse files

ARM: smp_twd: make local_timer_stop a symbol instead of a #define 



When CONFIG_HAVE_ARM_TWD is selected, local_timer_stop is a #define,
while all other local timers are using a real function.

Convert it to an alias of twd_timer_stop, as it helps converting
all local timers to another internal API in a sane way.

Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent a2821146

arch/arm/include/asm/localtimer.h

+1 −5
Original line number Diff line number Diff line
@@ -26,17 +26,13 @@ void percpu_timer_setup(void); 


#include "smp_twd.h"



#define local_timer_stop(c)	twd_timer_stop((c))



#else

#endif



/*

 * Stop the local timer

 */

void local_timer_stop(struct clock_event_device *);



#endif



/*

 * Setup a local timer interrupt for a CPU.

 */

arch/arm/include/asm/smp_twd.h

+0 −1
Original line number Diff line number Diff line
@@ -23,6 +23,5 @@ struct clock_event_device; 
extern void __iomem *twd_base;



void twd_timer_setup(struct clock_event_device *);

void twd_timer_stop(struct clock_event_device *);



#endif

arch/arm/kernel/smp_twd.c

+6 −1
Original line number Diff line number Diff line
@@ -87,12 +87,17 @@ int twd_timer_ack(void) 
	return 0;

}



void twd_timer_stop(struct clock_event_device *clk)

static void twd_timer_stop(struct clock_event_device *clk)

{

	twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk);

	disable_percpu_irq(clk->irq);

}



/* Temporary hack to be removed when all TWD users are converted to

   the new registration interface */

void local_timer_stop(struct clock_event_device *clk)

	__attribute__ ((alias ("twd_timer_stop")));



#ifdef CONFIG_CPU_FREQ



/*