diff options
| author | Ingo Molnar | 2017-01-27 11:16:07 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2017-01-28 09:31:13 +0100 |
| commit | 99da1ffe0a85a727c368afa7fc21f7a740477aa4 (patch) | |
| tree | a10847120806d0c1e8198a29f365f28c964b2436 /arch/x86/include/uapi | |
| parent | x86/boot/e820: Move asm/e820.h to asm/e820/api.h (diff) | |
| download | kernel-qcow2-linux-99da1ffe0a85a727c368afa7fc21f7a740477aa4.tar.gz kernel-qcow2-linux-99da1ffe0a85a727c368afa7fc21f7a740477aa4.tar.xz kernel-qcow2-linux-99da1ffe0a85a727c368afa7fc21f7a740477aa4.zip | |
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 <athorlton@sgi.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brian Gerst <brgerst@gmail.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Denys Vlasenko <dvlasenk@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Huang, Ying <ying.huang@intel.com>
Cc: Josh Poimboeuf <jpoimboe@redhat.com>
Cc: Juergen Gross <jgross@suse.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Paul Jackson <pj@sgi.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Tejun Heo <tj@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Wei Yang <richard.weiyang@gmail.com>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: linux-kernel@vger.kernel.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/uapi')
| -rw-r--r-- | arch/x86/include/uapi/asm/bootparam.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/uapi/asm/e820/types.h | 21 |
2 files changed, 22 insertions, 1 deletions
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 */ |