Around Sun 07 Apr 2013 00:43:36 +0800 or thereabout, Jiang Liu wrote: > Fix building warnings caused by redifinitions of HZ: > In file included from /ws/linux/kernel/linux.git/include/uapi/linux/param.h:4, > from include/linux/timex.h:63, > from include/linux/jiffies.h:8, > from include/linux/ktime.h:25, > from include/linux/timer.h:5, > from include/linux/workqueue.h:8, > from include/linux/srcu.h:34, > from include/linux/notifier.h:15, > from include/linux/memory_hotplug.h:6, > from include/linux/mmzone.h:777, > from include/linux/gfp.h:4, > from arch/avr32/mm/init.c:10: > /ws/linux/kernel/linux.git/arch/avr32/include/asm/param.h:6:1: warning: "HZ" > redefined > In file included from > /ws/linux/kernel/linux.git/arch/avr32/include/asm/param.h:4, > from /ws/linux/kernel/linux.git/include/uapi/linux/param.h:4, > from include/linux/timex.h:63, > from include/linux/jiffies.h:8, > from include/linux/ktime.h:25, > from include/linux/timer.h:5, > from include/linux/workqueue.h:8, > from include/linux/srcu.h:34, > from include/linux/notifier.h:15, > from include/linux/memory_hotplug.h:6, > from include/linux/mmzone.h:777, > from include/linux/gfp.h:4, > from arch/avr32/mm/init.c:10: > /ws/linux/kernel/linux.git/arch/avr32/include/uapi/asm/param.h:6:1: warning: > this is the location of the previous definition
Thanks for fixing. > Signed-off-by: Jiang Liu <jiang....@huawei.com> > Cc: Haavard Skinnemoen <hskinnem...@gmail.com> > Cc: Hans-Christian Egtvedt <egtv...@samfundet.no> > Cc: linux-kernel@vger.kernel.org Acked-by: Hans-Christian Egtvedt <egtv...@samfundet.no> > --- > arch/avr32/include/uapi/asm/param.h | 6 +++++- > 1 file changed, 5 insertions(+), 1 deletion(-) > > diff --git a/arch/avr32/include/uapi/asm/param.h > b/arch/avr32/include/uapi/asm/param.h > index d28aa5e..abda103 100644 > --- a/arch/avr32/include/uapi/asm/param.h > +++ b/arch/avr32/include/uapi/asm/param.h > @@ -2,7 +2,11 @@ > #define _UAPI__ASM_AVR32_PARAM_H > > > -#ifndef HZ > +#ifndef __KERNEL__ > + /* > + * Technically, this is wrong, but some old apps still refer to it. > + * The proper way to get the HZ value is via sysconf(_SC_CLK_TCK). > + */ With this comment, are there AVR32 drivers/users that should be fixed? Or is it parts of the tree in general? > # define HZ 100 > #endif > -- mvh Hans-Christian Egtvedt -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
