x86/uapi: Fix asm/bootparam.h userspace compilation errors

Consistently use types provided by <linux/types.h> to fix the following
asm/bootparam.h userspace compilation errors:

	/usr/include/asm/bootparam.h:140:2: error: unknown type name 'u16'
	  u16 version;
	/usr/include/asm/bootparam.h:141:2: error: unknown type name 'u16'
	  u16 compatible_version;
	/usr/include/asm/bootparam.h:142:2: error: unknown type name 'u16'
	  u16 pm_timer_address;
	/usr/include/asm/bootparam.h:143:2: error: unknown type name 'u16'
	  u16 num_cpus;
	/usr/include/asm/bootparam.h:144:2: error: unknown type name 'u64'
	  u64 pci_mmconfig_base;
	/usr/include/asm/bootparam.h:145:2: error: unknown type name 'u32'
	  u32 tsc_khz;
	/usr/include/asm/bootparam.h:146:2: error: unknown type name 'u32'
	  u32 apic_khz;
	/usr/include/asm/bootparam.h:147:2: error: unknown type name 'u8'
	  u8 standard_ioapic;
	/usr/include/asm/bootparam.h:148:2: error: unknown type name 'u8'
	  u8 cpu_ids[255];

Signed-off-by: Dmitry V. Levin <[email protected]>
Acked-by: Jan Kiszka <[email protected]>
Cc: <[email protected]> # v4.16
Cc: Linus Torvalds <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Fixes: 4a362601baa6 ("x86/jailhouse: Add infrastructure for running in non-root cell")
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
index aebf603577587680efaa12d6b44d1b849dfa9eb4..a06cbf01974462de6cf163fb87008453fd6c019c 100644 (file)
--- a/arch/x86/include/uapi/asm/bootparam.h
+++ b/arch/x86/include/uapi/asm/bootparam.h
@@ -137,15 +137,15 @@ struct boot_e820_entry {
  * setup data structure.
  */
 struct jailhouse_setup_data {
-       u16     version;
-       u16     compatible_version;
-       u16     pm_timer_address;
-       u16     num_cpus;
-       u64     pci_mmconfig_base;
-       u32     tsc_khz;
-       u32     apic_khz;
-       u8      standard_ioapic;
-       u8      cpu_ids[255];
+       __u16   version;
+       __u16   compatible_version;
+       __u16   pm_timer_address;
+       __u16   num_cpus;
+       __u64   pci_mmconfig_base;
+       __u32   tsc_khz;
+       __u32   apic_khz;
+       __u8    standard_ioapic;
+       __u8    cpu_ids[255];
 } __attribute__((packed));
 
 /* The so-called "zeropage" */