diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-27 11:16:07 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-28 09:31:13 +0100 |
| commit | 99da1ffe0a85a727c368afa7fc21f7a740477aa4 (patch) | |
| tree | a10847120806d0c1e8198a29f365f28c964b2436 /arch/x86/include/asm/e820 | |
| parent | 66441bd3cfdcc03816b7009a296c284d70f629e1 (diff) | |
| download | talos-op-linux-99da1ffe0a85a727c368afa7fc21f7a740477aa4.tar.gz talos-op-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/asm/e820')
| -rw-r--r-- | arch/x86/include/asm/e820/types.h | 15 |
1 files changed, 2 insertions, 13 deletions
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 { |
