Commit 79c157a3 authored by Guenter Roeck's avatar Guenter Roeck Committed by Michal Simek
Browse files

microblaze: Rename global function heartbeat() 



microblaze:allmodconfig complains for some configurations that 'heartbeat'
is redefined as different kind of symbol. This is seen in test compiles
of watchdog drivers, which often use 'heartbeat' as ststic variable.

Since 'heartbeat' is an unfortunate name for a global function,
rename it to microblaze_heartbeat. Also rename the setup function
to microblaze_setup_heartbeat.

Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
parent fa389e22

arch/microblaze/include/asm/setup.h

+2 −2
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ int setup_early_printk(char *opt); 
void remap_early_printk(void);

void disable_early_printk(void);



void heartbeat(void);

void setup_heartbeat(void);

void microblaze_heartbeat(void);

void microblaze_setup_heartbeat(void);



#   ifdef CONFIG_MMU

extern void mmu_reset(void);

arch/microblaze/kernel/heartbeat.c

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 


static unsigned int base_addr;



void heartbeat(void)

void microblaze_heartbeat(void)

{

	static unsigned int cnt, period, dist;
@@ -42,7 +42,7 @@ void heartbeat(void) 
	}

}



void setup_heartbeat(void)

void microblaze_setup_heartbeat(void)

{

	struct device_node *gpio = NULL;

	int *prop;

arch/microblaze/kernel/timer.c

+2 −2
Original line number Diff line number Diff line
@@ -140,7 +140,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id) 
{

	struct clock_event_device *evt = &clockevent_xilinx_timer;

#ifdef CONFIG_HEART_BEAT

	heartbeat();

	microblaze_heartbeat();

#endif

	timer_ack();

	evt->event_handler(evt);
@@ -274,7 +274,7 @@ static void __init xilinx_timer_init(struct device_node *timer) 


	setup_irq(irq, &timer_irqaction);

#ifdef CONFIG_HEART_BEAT

	setup_heartbeat();

	microblaze_setup_heartbeat();

#endif

	xilinx_clocksource_init();

	xilinx_clockevent_init();

CRA Git | Maintained and supported by SUSTech CRA and CCSE