hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
This commit is contained in:
Guenter Roeck 2014-02-17 22:46:54 -08:00 committed by Michal Simek
parent fa389e2202
commit 79c157a3fb
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/microblaze/include/asm/setup.h
View File

@ -25,8 +25,8 @@ int setup_early_printk(char *opt);
void remap_early_printk(void); void remap_early_printk(void);
void disable_early_printk(void); void disable_early_printk(void);
void heartbeat(void); void microblaze_heartbeat(void);
void setup_heartbeat(void); void microblaze_setup_heartbeat(void);
# ifdef CONFIG_MMU # ifdef CONFIG_MMU
extern void mmu_reset(void); extern void mmu_reset(void);

4
arch/microblaze/kernel/heartbeat.c
View File

@ -17,7 +17,7 @@
static unsigned int base_addr; static unsigned int base_addr;
void heartbeat(void) void microblaze_heartbeat(void)
{ {
static unsigned int cnt, period, dist; 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; struct device_node *gpio = NULL;
int *prop; int *prop;

4
arch/microblaze/kernel/timer.c
View File

@ -140,7 +140,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id)
{ {
struct clock_event_device *evt = &clockevent_xilinx_timer; struct clock_event_device *evt = &clockevent_xilinx_timer;
#ifdef CONFIG_HEART_BEAT #ifdef CONFIG_HEART_BEAT
heartbeat(); microblaze_heartbeat();
#endif #endif
timer_ack(); timer_ack();
evt->event_handler(evt); evt->event_handler(evt);
@ -274,7 +274,7 @@ static void __init xilinx_timer_init(struct device_node *timer)
setup_irq(irq, &timer_irqaction); setup_irq(irq, &timer_irqaction);
#ifdef CONFIG_HEART_BEAT #ifdef CONFIG_HEART_BEAT
setup_heartbeat(); microblaze_setup_heartbeat();
#endif #endif
xilinx_clocksource_init(); xilinx_clocksource_init();
xilinx_clockevent_init(); xilinx_clockevent_init();