hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Ingo Molnar 2017-01-27 11:16:07 +01:00
parent 66441bd3cf
commit 99da1ffe0a
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/acpi.h
View File

@ -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);

15
arch/x86/include/asm/e820/types.h
View File

@ -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.
@ -68,16 +67,6 @@
#ifndef __ASSEMBLY__
#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:
*/

2
arch/x86/include/uapi/asm/bootparam.h
View File

@ -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>

21
arch/x86/include/uapi/asm/e820/types.h Normal file
View File

@ -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 */