1 files changed, 55 insertions, 49 deletions

diff --git a/include/asm-arm/setup.h b/include/asm-arm/setup.h
index aa4b5782f0c9..e5407392afca 100644
--- a/include/asm-arm/setup.h
+++ b/include/asm-arm/setup.h
@@ -14,55 +14,57 @@
 #ifndef __ASMARM_SETUP_H
 #define __ASMARM_SETUP_H
 
+#include <asm/types.h>
+
 #define COMMAND_LINE_SIZE 1024
 
 /* The list ends with an ATAG_NONE node. */
 #define ATAG_NONE       0x00000000
 
 struct tag_header {
-        u32 size;
-        u32 tag;
+        __u32 size;
+        __u32 tag;
 };
 
 /* The list must start with an ATAG_CORE node */
 #define ATAG_CORE       0x54410001
 
 struct tag_core {
-        u32 flags;              /* bit 0 = read-only */
-        u32 pagesize;
-        u32 rootdev;
+        __u32 flags;            /* bit 0 = read-only */
+        __u32 pagesize;
+        __u32 rootdev;
 };
 
 /* it is allowed to have multiple ATAG_MEM nodes */
 #define ATAG_MEM        0x54410002
 
 struct tag_mem32 {
-        u32     size;
-        u32     start;  /* physical start address */
+        __u32   size;
+        __u32   start;  /* physical start address */
 };
 
 /* VGA text type displays */
 #define ATAG_VIDEOTEXT  0x54410003
 
 struct tag_videotext {
-        u8              x;
-        u8              y;
-        u16             video_page;
-        u8              video_mode;
-        u8              video_cols;
-        u16             video_ega_bx;
-        u8              video_lines;
-        u8              video_isvga;
-        u16             video_points;
+        __u8            x;
+        __u8            y;
+        __u16           video_page;
+        __u8            video_mode;
+        __u8            video_cols;
+        __u16           video_ega_bx;
+        __u8            video_lines;
+        __u8            video_isvga;
+        __u16           video_points;
 };
 
 /* describes how the ramdisk will be used in kernel */
 #define ATAG_RAMDISK    0x54410004
 
 struct tag_ramdisk {
-        u32 flags;      /* bit 0 = load, bit 1 = prompt */
-        u32 size;       /* decompressed ramdisk size in _kilo_ bytes */
-        u32 start;      /* starting block of floppy-based RAM disk image */
+        __u32 flags;    /* bit 0 = load, bit 1 = prompt */
+        __u32 size;     /* decompressed ramdisk size in _kilo_ bytes */
+        __u32 start;    /* starting block of floppy-based RAM disk image */
 };
 
 /* describes where the compressed ramdisk image lives (virtual address) */
@@ -76,23 +78,23 @@ struct tag_ramdisk {
 #define ATAG_INITRD2    0x54420005
 
 struct tag_initrd {
-        u32 start;      /* physical start address */
-        u32 size;       /* size of compressed ramdisk image in bytes */
+        __u32 start;    /* physical start address */
+        __u32 size;     /* size of compressed ramdisk image in bytes */
 };
 
 /* board serial number. "64 bits should be enough for everybody" */
 #define ATAG_SERIAL     0x54410006
 
 struct tag_serialnr {
-        u32 low;
-        u32 high;
+        __u32 low;
+        __u32 high;
 };
 
 /* board revision */
 #define ATAG_REVISION   0x54410007
 
 struct tag_revision {
-        u32 rev;
+        __u32 rev;
 };
 
 /* initial values for vesafb-type framebuffers. see struct screen_info
@@ -101,20 +103,20 @@ struct tag_revision {
 #define ATAG_VIDEOLFB   0x54410008
 
 struct tag_videolfb {
-        u16             lfb_width;
-        u16             lfb_height;
-        u16             lfb_depth;
-        u16             lfb_linelength;
-        u32             lfb_base;
-        u32             lfb_size;
-        u8              red_size;
-        u8              red_pos;
-        u8              green_size;
-        u8              green_pos;
-        u8              blue_size;
-        u8              blue_pos;
-        u8              rsvd_size;
-        u8              rsvd_pos;
+        __u16           lfb_width;
+        __u16           lfb_height;
+        __u16           lfb_depth;
+        __u16           lfb_linelength;
+        __u32           lfb_base;
+        __u32           lfb_size;
+        __u8            red_size;
+        __u8            red_pos;
+        __u8            green_size;
+        __u8            green_pos;
+        __u8            blue_size;
+        __u8            blue_pos;
+        __u8            rsvd_size;
+        __u8            rsvd_pos;
 };
 
 /* command line: \0 terminated string */
@@ -128,17 +130,17 @@ struct tag_cmdline {
 #define ATAG_ACORN      0x41000101
 
 struct tag_acorn {
-        u32 memc_control_reg;
-        u32 vram_pages;
-        u8 sounddefault;
-        u8 adfsdrives;
+        __u32 memc_control_reg;
+        __u32 vram_pages;
+        __u8 sounddefault;
+        __u8 adfsdrives;
 };
 
 /* footbridge memory clock, see arch/arm/mach-footbridge/arch.c */
 #define ATAG_MEMCLK     0x41000402
 
 struct tag_memclk {
-        u32 fmemclk;
+        __u32 fmemclk;
 };
 
 struct tag {
@@ -167,24 +169,26 @@ struct tag {
 };
 
 struct tagtable {
-        u32 tag;
+        __u32 tag;
         int (*parse)(const struct tag *);
 };
 
-#define __tag __attribute_used__ __attribute__((__section__(".taglist.init")))
-#define __tagtable(tag, fn) \
-static struct tagtable __tagtable_##fn __tag = { tag, fn }
-
 #define tag_member_present(tag,member)                          \
         ((unsigned long)(&((struct tag *)0L)->member + 1)       \
                 <= (tag)->hdr.size * 4)
 
-#define tag_next(t)     ((struct tag *)((u32 *)(t) + (t)->hdr.size))
+#define tag_next(t)     ((struct tag *)((__u32 *)(t) + (t)->hdr.size))
 #define tag_size(type)  ((sizeof(struct tag_header) + sizeof(struct type)) >> 2)
 
 #define for_each_tag(t,base)            \
         for (t = base; t->hdr.size; t = tag_next(t))
 
+#ifdef __KERNEL__
+
+#define __tag __attribute_used__ __attribute__((__section__(".taglist.init")))
+#define __tagtable(tag, fn) \
+static struct tagtable __tagtable_##fn __tag = { tag, fn }
+
 /*
  * Memory map description
  */
@@ -217,4 +221,6 @@ struct early_params {
 static struct early_params __early_##fn __attribute_used__      \
 __attribute__((__section__(".early_param.init"))) = { name, fn }
 
+#endif  /*  __KERNEL__  */
+
 #endif