diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-13 08:59:23 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-06-13 08:59:23 -0700 |
| commit | 45df901cc8ad10d03d77ddad8f37589b047144ef (patch) | |
| tree | c2d07b2e487937cd4dd124d7ff5f709f52a9ccf8 /arch/x86/include | |
| parent | c8a22d19dd238ede87aa0ac4f7dbea8da039b9c1 (diff) | |
| parent | f8b8404337de4e2466e2e1139ea68b1f8295974f (diff) | |
| download | linux-3.10-45df901cc8ad10d03d77ddad8f37589b047144ef.tar.gz linux-3.10-45df901cc8ad10d03d77ddad8f37589b047144ef.tar.bz2 linux-3.10-45df901cc8ad10d03d77ddad8f37589b047144ef.zip | |
Merge tag 'efi-urgent' into x86/urgent
* More tweaking to the EFI variable anti-bricking algorithm. Quite a
few users were reporting boot regressions in v3.9. This has now been
fixed with a more accurate "minimum storage requirement to avoid
bricking" value from Samsung (5K instead of 50%) and code to trigger
garbage collection when we near our limit - Matthew Garrett.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/efi.h | 7 | ||||
| -rw-r--r-- | arch/x86/include/uapi/asm/bootparam.h | 1 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/x86/include/asm/efi.h b/arch/x86/include/asm/efi.h index 2fb5d5884e2..60c89f30c72 100644 --- a/arch/x86/include/asm/efi.h +++ b/arch/x86/include/asm/efi.h @@ -102,13 +102,6 @@ extern void efi_call_phys_epilog(void); extern void efi_unmap_memmap(void); extern void efi_memory_uc(u64 addr, unsigned long size); -struct efi_var_bootdata { - struct setup_data data; - u64 store_size; - u64 remaining_size; - u64 max_var_size; -}; - #ifdef CONFIG_EFI static inline bool efi_is_native(void) diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h index 08744242b8d..c15ddaf9071 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -6,7 +6,6 @@ #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 |