diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 00:09:03 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-04-20 00:09:03 (GMT) |
| commit | c0a9f451e4e7ecd2ad1a6c27ea5c31d0226bdddf (patch) | |
| tree | dcb22c46c33a994db115ec8925093f91f6463f15 /arch/x86/include/uapi | |
| parent | 74c3e3fcf350b2e7e3eaf9550528ee3f74e44b37 (diff) | |
| parent | 8c58bf3eec3b8fc8162fe557e9361891c20758f2 (diff) | |
| download | linux-c0a9f451e4e7ecd2ad1a6c27ea5c31d0226bdddf.tar.xz | |
Merge remote-tracking branch 'efi/urgent' into x86/urgent
Matt Fleming (1):
x86, efivars: firmware bug workarounds should be in platform
code
Matthew Garrett (3):
Move utf16 functions to kernel core and rename
efi: Pass boot services variable info to runtime code
efi: Distinguish between "remaining space" and actually used
space
Richard Weinberger (2):
x86,efi: Check max_size only if it is non-zero.
x86,efi: Implement efi_no_storage_paranoia parameter
Sergey Vlasov (2):
x86/Kconfig: Make EFI select UCS2_STRING
efi: Export efi_query_variable_store() for efivars.ko
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include/uapi')
| -rw-r--r-- | arch/x86/include/uapi/asm/bootparam.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h index c15ddaf..0874424 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -6,6 +6,7 @@ #define SETUP_E820_EXT 1 #define SETUP_DTB 2 #define SETUP_PCI 3 +#define SETUP_EFI_VARS 4 /* ram_size flags */ #define RAMDISK_IMAGE_START_MASK 0x07FF |