microblaze: Rename global function heartbeat()
PATCH v2 1/1 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.
---
v2: Use microblaze_ instead of xilinx_ as function prefix.
arch/microblaze/include/asm/setup.h | 4 ++-- arch/microblaze/kernel/heartbeat.c | 4 ++-- arch/microblaze/kernel/timer.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
arch/microblaze/include/asm/setup.h +2 -2
@@ -23,8 +23,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
@@ -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
@@ -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 ();
Signature · 1 line
1.7.9.7
Quoted 8 lines · Guenter Roeck
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 tomicroblaze_setup_heartbeat.
Quoted 8 lines
Signed-off-by Guenter Roeck <[email protected]>---
v2: Usemicroblaze_instead ofxilinx_as function prefix.arch/microblaze/include/asm/setup.h | 4 ++-- arch/microblaze/kernel/heartbeat.c | 4 ++-- arch/microblaze/kernel/timer.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-)
Applied. both to microblaze next branch.
Thanks,
Michal
Signature · 5 lines
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91 w: www.monstr.eu p: +42-0-721842854 Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/ Maintainer of Linux kernel - Xilinx Zynq ARM architecture Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform