Re: [PATCH v2] microblaze: Rename global function heartbeat()

[Michal Simek <monstr@monstr.eu>]

[-- Attachment #1: Type: text/plain, Size: 1157 bytes --]

On 02/18/2014 07:46 AM, Guenter Roeck wrote:
> 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>
> ---
> 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(-)

Applied. both to microblaze next branch.

Thanks,
Michal

-- 
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



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 263 bytes --]