| Message ID | 1350433728-24120-3-git-send-email-kim.phillips@freescale.com |
|---|---|
| State | Changes Requested |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Oct 16, 2012 at 07:28:18PM -0500, Kim Phillips wrote: > include/linux/compat.h:4:9: warning: preprocessor token __user redefined > include/linux/compiler.h:7:10: this was the original definition > include/linux/compat.h:5:9: warning: preprocessor token __iomem redefined > include/linux/compiler.h:12:10: this was the original definition > > fixup __iomem, __user definitions in compat.h code appears to be placed > there as a cover up from a code import from linux when u-boot didn't yet > have a compiler.h, introduced by commit > 932394ac43e2e778e664eeb6e456fecd0fae6e59 "Rewrite of NAND code based on > what is in 2.6.12 Linux kernel". > > Signed-off-by: Kim Phillips <kim.phillips@freescale.com> include/linux/mtd/mtd-api.h now blows up on a number of omap3 boards with: In file included from .../u-boot/u-boot/include/linux/mtd/mtd.h:12:0, from mtdcore.c:10: .../u-boot/include/linux/mtd/mtd-abi.h:22:23: error: expected ':', ',', ';', '}' or '__attribute__' before '*' token I can get past this locally by adding <linux/compiler.h> to the file in question.
diff --git a/include/linux/compat.h b/include/linux/compat.h index 593b07f..e1338bf 100644 --- a/include/linux/compat.h +++ b/include/linux/compat.h @@ -1,9 +1,6 @@ #ifndef _LINUX_COMPAT_H_ #define _LINUX_COMPAT_H_ -#define __user -#define __iomem - #define ndelay(x) udelay(1) #define printk printf
include/linux/compat.h:4:9: warning: preprocessor token __user redefined include/linux/compiler.h:7:10: this was the original definition include/linux/compat.h:5:9: warning: preprocessor token __iomem redefined include/linux/compiler.h:12:10: this was the original definition fixup __iomem, __user definitions in compat.h code appears to be placed there as a cover up from a code import from linux when u-boot didn't yet have a compiler.h, introduced by commit 932394ac43e2e778e664eeb6e456fecd0fae6e59 "Rewrite of NAND code based on what is in 2.6.12 Linux kernel". Signed-off-by: Kim Phillips <kim.phillips@freescale.com> --- include/linux/compat.h | 3 --- 1 file changed, 3 deletions(-)