bootparam.h, which defines the legacy 'zeropage' boot parameter area, requires a small amount of e280 defines in the UAPI space - provide them.
No change in functionality. Cc: Alex Thorlton <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Dan Williams <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Huang, Ying <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: Juergen Gross <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Paul Jackson <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rafael J. Wysocki <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Wei Yang <[email protected]> Cc: Yinghai Lu <[email protected]> Cc: [email protected] Signed-off-by: Ingo Molnar <[email protected]> --- arch/x86/include/asm/acpi.h | 2 ++ arch/x86/include/asm/e820/types.h | 15 ++------------- arch/x86/include/uapi/asm/bootparam.h | 2 +- arch/x86/include/uapi/asm/e820/types.h | 21 +++++++++++++++++++++ 4 files changed, 26 insertions(+), 14 deletions(-) diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 395b69551fce..2efc768e4362 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -52,6 +52,8 @@ extern u8 acpi_sci_flags; extern int acpi_sci_override_gsi; void acpi_pic_sci_set_trigger(unsigned int, u16); +struct device; + extern int (*__acpi_register_gsi)(struct device *dev, u32 gsi, int trigger, int polarity); extern void (*__acpi_unregister_gsi)(u32 gsi); diff --git a/arch/x86/include/asm/e820/types.h b/arch/x86/include/asm/e820/types.h index cfa8f4a19b5d..cf73c104c041 100644 --- a/arch/x86/include/asm/e820/types.h +++ b/arch/x86/include/asm/e820/types.h @@ -1,12 +1,11 @@ #ifndef _ASM_E820_TYPES_H #define _ASM_E820_TYPES_H +#include <uapi/asm/e820/types.h> + /* Our map: */ #define E820MAP 0x2d0 -/* The maximum number of entries in E820MAP: */ -#define E820MAX 128 - /* * The legacy E820 BIOS limits us to 128 (E820MAX) nodes due to the * constrained space in the zeropage. @@ -69,16 +68,6 @@ #include <linux/types.h> /* - * A single E820 map entry, describing a memory range of [addr...addr+size-1], - * of 'type' memory type: - */ -struct e820entry { - __u64 addr; - __u64 size; - __u32 type; -} __attribute__((packed)); - -/* * The whole array of E820 entries: */ struct e820map { diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h index 2214bfc65c66..742333c3ffea 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -34,7 +34,7 @@ #include <linux/screen_info.h> #include <linux/apm_bios.h> #include <linux/edd.h> -#include <asm/e820/api.h> +#include <uapi/asm/e820/types.h> #include <asm/ist.h> #include <video/edid.h> diff --git a/arch/x86/include/uapi/asm/e820/types.h b/arch/x86/include/uapi/asm/e820/types.h new file mode 100644 index 000000000000..8e522eb120aa --- /dev/null +++ b/arch/x86/include/uapi/asm/e820/types.h @@ -0,0 +1,21 @@ +#ifndef _UAPI_ASM_E820_TYPES_H +#define _UAPI_ASM_E820_TYPES_H + +/* The maximum number of entries in E820MAP: */ +#define E820MAX 128 + +#ifndef __ASSEMBLY__ + +/* + * A single E820 map entry, describing a memory range of [addr...addr+size-1], + * of 'type' memory type: + */ +struct e820entry { + __u64 addr; + __u64 size; + __u32 type; +} __attribute__((packed)); + +#endif /* __ASSEMBLY__ */ + +#endif /* _UAPI_ASM_E820_TYPES_H */ -- 2.7.4
