From 99da1ffe0a85a727c368afa7fc21f7a740477aa4 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Fri, 27 Jan 2017 11:16:07 +0100 Subject: [PATCH] x86/boot/e820: Split minimal UAPI types out into uapi/asm/e820/types.h 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 Cc: Andy Lutomirski Cc: Borislav Petkov Cc: Brian Gerst Cc: Dan Williams Cc: Denys Vlasenko Cc: H. Peter Anvin Cc: Huang, Ying Cc: Josh Poimboeuf Cc: Juergen Gross Cc: Linus Torvalds Cc: Paul Jackson Cc: Peter Zijlstra Cc: Rafael J. Wysocki Cc: Tejun Heo Cc: Thomas Gleixner Cc: Wei Yang Cc: Yinghai Lu Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar --- 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(-) create mode 100644 arch/x86/include/uapi/asm/e820/types.h 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 + /* 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. @@ -68,16 +67,6 @@ #ifndef __ASSEMBLY__ #include -/* - * 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: */ 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 #include #include -#include +#include #include #include