diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-10-12 13:38:31 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-10-12 13:38:31 +0200 |
| commit | 4d0a4388ccdd9482fef6b26f879d0f6099143f80 (patch) | |
| tree | b711a02c0cf93d50ac206511e879b4d3521d12b7 /include/linux/efi.h | |
| parent | cc383a9e245c527d3175e2cf4cced9dbbedbbac6 (diff) | |
| parent | d32de9130f6c79533508e2c7879f18997bfbe2a0 (diff) | |
Merge branch 'efi/urgent' into efi/core, to pick up fixes
These fixes missed the v5.9 merge window, pick them up for early v5.10 merge.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/efi.h')
| -rw-r--r-- | include/linux/efi.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index 4c8dae0b5c75..d7c0e73af2b9 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -122,6 +122,7 @@ typedef struct { ((u64)0x0000000000010000ULL) /* higher reliability */ #define EFI_MEMORY_RO ((u64)0x0000000000020000ULL) /* read-only */ #define EFI_MEMORY_SP ((u64)0x0000000000040000ULL) /* soft reserved */ +#define EFI_MEMORY_CPU_CRYPTO ((u64)0x0000000000080000ULL) /* supports encryption */ #define EFI_MEMORY_RUNTIME ((u64)0x8000000000000000ULL) /* range requires runtime mapping */ #define EFI_MEMORY_DESCRIPTOR_VERSION 1 |