m68k/UAPI: Use proper types (endianness/size) in <asm/bootinfo*.h>

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>

7 files changed, 40 insertions, 34 deletions

diff --git a/arch/m68k/include/uapi/asm/bootinfo-amiga.h b/arch/m68k/include/uapi/asm/bootinfo-amiga.h
index 28b6da07874a..daad3c58d2da 100644
--- a/arch/m68k/include/uapi/asm/bootinfo-amiga.h
+++ b/arch/m68k/include/uapi/asm/bootinfo-amiga.h
@@ -10,15 +10,15 @@
      *  Amiga-specific tags
      */
 
-#define BI_AMIGA_MODEL          0x8000  /* model (u_long) */
+#define BI_AMIGA_MODEL          0x8000  /* model (__be32) */
 #define BI_AMIGA_AUTOCON        0x8001  /* AutoConfig device */
                                         /* (AmigaOS struct ConfigDev) */
-#define BI_AMIGA_CHIP_SIZE      0x8002  /* size of Chip RAM (u_long) */
-#define BI_AMIGA_VBLANK         0x8003  /* VBLANK frequency (u_char) */
-#define BI_AMIGA_PSFREQ         0x8004  /* power supply frequency (u_char) */
-#define BI_AMIGA_ECLOCK         0x8005  /* EClock frequency (u_long) */
-#define BI_AMIGA_CHIPSET        0x8006  /* native chipset present (u_long) */
-#define BI_AMIGA_SERPER         0x8007  /* serial port period (u_short) */
+#define BI_AMIGA_CHIP_SIZE      0x8002  /* size of Chip RAM (__be32) */
+#define BI_AMIGA_VBLANK         0x8003  /* VBLANK frequency (__u8) */
+#define BI_AMIGA_PSFREQ         0x8004  /* power supply frequency (__u8) */
+#define BI_AMIGA_ECLOCK         0x8005  /* EClock frequency (__be32) */
+#define BI_AMIGA_CHIPSET        0x8006  /* native chipset present (__be32) */
+#define BI_AMIGA_SERPER         0x8007  /* serial port period (__be16) */
 
 
     /*
diff --git a/arch/m68k/include/uapi/asm/bootinfo-apollo.h b/arch/m68k/include/uapi/asm/bootinfo-apollo.h
index 69923697e131..a93e0af1c6fe 100644
--- a/arch/m68k/include/uapi/asm/bootinfo-apollo.h
+++ b/arch/m68k/include/uapi/asm/bootinfo-apollo.h
@@ -10,7 +10,7 @@
      *  Apollo-specific tags
      */
 
-#define BI_APOLLO_MODEL         0x8000  /* model (u_long) */
+#define BI_APOLLO_MODEL         0x8000  /* model (__be32) */
 
 
     /*
diff --git a/arch/m68k/include/uapi/asm/bootinfo-atari.h b/arch/m68k/include/uapi/asm/bootinfo-atari.h
index cca0a83fc0e5..a817854049bb 100644
--- a/arch/m68k/include/uapi/asm/bootinfo-atari.h
+++ b/arch/m68k/include/uapi/asm/bootinfo-atari.h
@@ -10,8 +10,8 @@
      *  Atari-specific tags
      */
 
-#define BI_ATARI_MCH_COOKIE     0x8000  /* _MCH cookie from TOS (u_long) */
-#define BI_ATARI_MCH_TYPE       0x8001  /* special machine type (u_long) */
+#define BI_ATARI_MCH_COOKIE     0x8000  /* _MCH cookie from TOS (__be32) */
+#define BI_ATARI_MCH_TYPE       0x8001  /* special machine type (__be32) */
 
 
     /*
diff --git a/arch/m68k/include/uapi/asm/bootinfo-hp300.h b/arch/m68k/include/uapi/asm/bootinfo-hp300.h
index 08530e12d4c3..c90cb71ed89a 100644
--- a/arch/m68k/include/uapi/asm/bootinfo-hp300.h
+++ b/arch/m68k/include/uapi/asm/bootinfo-hp300.h
@@ -10,9 +10,9 @@
      *  HP9000/300-specific tags
      */
 
-#define BI_HP300_MODEL          0x8000  /* model (u_long) */
-#define BI_HP300_UART_SCODE     0x8001  /* UART select code (u_long) */
-#define BI_HP300_UART_ADDR      0x8002  /* phys. addr of UART (u_long) */
+#define BI_HP300_MODEL          0x8000  /* model (__be32) */
+#define BI_HP300_UART_SCODE     0x8001  /* UART select code (__be32) */
+#define BI_HP300_UART_ADDR      0x8002  /* phys. addr of UART (__be32) */
 
 
     /*
diff --git a/arch/m68k/include/uapi/asm/bootinfo-mac.h b/arch/m68k/include/uapi/asm/bootinfo-mac.h
index 971046f49bb9..b44ff73898a9 100644
--- a/arch/m68k/include/uapi/asm/bootinfo-mac.h
+++ b/arch/m68k/include/uapi/asm/bootinfo-mac.h
@@ -7,7 +7,7 @@
 
 
     /*
-     *  Macintosh-specific tags (all u_long)
+     *  Macintosh-specific tags (all __be32)
      */
 
 #define BI_MAC_MODEL            0x8000  /* Mac Gestalt ID (model type) */
diff --git a/arch/m68k/include/uapi/asm/bootinfo-vme.h b/arch/m68k/include/uapi/asm/bootinfo-vme.h
index 13ba5e19fe24..a135eb41d672 100644
--- a/arch/m68k/include/uapi/asm/bootinfo-vme.h
+++ b/arch/m68k/include/uapi/asm/bootinfo-vme.h
@@ -6,11 +6,14 @@
 #define _UAPI_ASM_M68K_BOOTINFO_VME_H
 
 
+#include <linux/types.h>
+
+
     /*
      *  VME-specific tags
      */
 
-#define BI_VME_TYPE             0x8000  /* VME sub-architecture (u_long) */
+#define BI_VME_TYPE             0x8000  /* VME sub-architecture (__be32) */
 #define BI_VME_BRDINFO          0x8001  /* VME board information (struct) */
 
 
@@ -43,13 +46,13 @@
 
 typedef struct {
         char    bdid[4];
-        u_char  rev, mth, day, yr;
-        u_short size, reserved;
-        u_short brdno;
+        __u8    rev, mth, day, yr;
+        __be16  size, reserved;
+        __be16  brdno;
         char    brdsuffix[2];
-        u_long  options;
-        u_short clun, dlun, ctype, dnum;
-        u_long  option2;
+        __be32  options;
+        __be16  clun, dlun, ctype, dnum;
+        __be32  option2;
 } t_bdid, *p_bdid;
 
 #endif /* __ASSEMBLY__ */
diff --git a/arch/m68k/include/uapi/asm/bootinfo.h b/arch/m68k/include/uapi/asm/bootinfo.h
index 9d64599d7bf5..cdeb26a015b0 100644
--- a/arch/m68k/include/uapi/asm/bootinfo.h
+++ b/arch/m68k/include/uapi/asm/bootinfo.h
@@ -12,6 +12,9 @@
 #define _UAPI_ASM_M68K_BOOTINFO_H
 
 
+#include <linux/types.h>
+
+
 #ifndef __ASSEMBLY__
 
     /*
@@ -28,15 +31,15 @@
      */
 
 struct bi_record {
-        unsigned short tag;             /* tag ID */
-        unsigned short size;            /* size of record (in bytes) */
-        unsigned long data[0];          /* data */
+        __be16 tag;                     /* tag ID */
+        __be16 size;                    /* size of record (in bytes) */
+        __be32 data[0];                 /* data */
 };
 
 
 struct mem_info {
-        unsigned long addr;             /* physical address of memory chunk */
-        unsigned long size;             /* length of memory chunk (in bytes) */
+        __be32 addr;                    /* physical address of memory chunk */
+        __be32 size;                    /* length of memory chunk (in bytes) */
 };
 
 #endif /* __ASSEMBLY__ */
@@ -50,10 +53,10 @@ struct mem_info {
      */
 
 #define BI_LAST                 0x0000  /* last record (sentinel) */
-#define BI_MACHTYPE             0x0001  /* machine type (u_long) */
-#define BI_CPUTYPE              0x0002  /* cpu type (u_long) */
-#define BI_FPUTYPE              0x0003  /* fpu type (u_long) */
-#define BI_MMUTYPE              0x0004  /* mmu type (u_long) */
+#define BI_MACHTYPE             0x0001  /* machine type (__be32) */
+#define BI_CPUTYPE              0x0002  /* cpu type (__be32) */
+#define BI_FPUTYPE              0x0003  /* fpu type (__be32) */
+#define BI_MMUTYPE              0x0004  /* mmu type (__be32) */
 #define BI_MEMCHUNK             0x0005  /* memory chunk address and size */
                                         /* (struct mem_info) */
 #define BI_RAMDISK              0x0006  /* ramdisk address and size */
@@ -157,11 +160,11 @@ struct mem_info {
 #ifndef __ASSEMBLY__
 
 struct bootversion {
-        unsigned short branch;
-        unsigned long magic;
+        __be16 branch;
+        __be32 magic;
         struct {
-                unsigned long machtype;
-                unsigned long version;
+                __be32 machtype;
+                __be32 version;
         } machversions[0];
 } __packed;