Around Fri 17 May 2013 23:45:18 +0800 or thereabout, Jiang Liu wrote: > As suggested by David Howells <dhowells@xxxxxxxxxx>, use > asm-generic/param.h and uapi/asm-generic/param.h for AVR32. > > It also fixes 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 > > Signed-off-by: Jiang Liu <jiang.liu@xxxxxxxxxx> > Cc: Hans-Christian Egtvedt <egtvedt@xxxxxxxxxxxx> > Cc: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> > Cc: linux-kernel@xxxxxxxxxxxxxxx Thanks, I'll pull this into the linux-avr32 tree. I'm in the mountains right now, but will make a pull request early next week. Acked-by: Hans-Christian Egtvedt <egtvedt@xxxxxxxxxxxx> > --- > arch/avr32/include/asm/Kbuild | 1 + > arch/avr32/include/asm/param.h | 9 --------- > arch/avr32/include/uapi/asm/Kbuild | 1 + > arch/avr32/include/uapi/asm/param.h | 18 ------------------ > 4 files changed, 2 insertions(+), 27 deletions(-) > delete mode 100644 arch/avr32/include/asm/param.h > delete mode 100644 arch/avr32/include/uapi/asm/param.h <snipp diff> -- HcE -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
