Commit 99da1ffe authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@kernel.org>
parent 66441bd3

arch/x86/include/asm/acpi.h

+2 −0
Original line number Diff line number Diff line
@@ -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);

arch/x86/include/asm/e820/types.h

+2 −13
Original line number Diff line number Diff line 
#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:

 */

arch/x86/include/uapi/asm/bootparam.h

+1 −1
Original line number Diff line number Diff line
@@ -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>

arch/x86/include/uapi/asm/e820/types.h

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#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 */