[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <530385D9.5090005@monstr.eu>
Date: Tue, 18 Feb 2014 17:10:01 +0100
From: Michal Simek <monstr@...str.eu>
To: Guenter Roeck <linux@...ck-us.net>
CC: microblaze-uclinux@...e.uq.edu.au, linux-kernel@...r.kernel.org,
achew@...dia.com
Subject: Re: [PATCH v2] microblaze: Rename global function heartbeat()
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@...ck-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
Download attachment "signature.asc" of type "application/pgp-signature" (264 bytes)
Powered by blists - more mailing lists