diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-26 09:20:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-26 09:20:01 +0200 |
| commit | 3cb9bc85029f2ceb7a5babadcab445c7cb861da8 (patch) | |
| tree | 6453e9ebb9ad3b3cab07ff31dc9a90ea9f7951bc /arch/x86/boot/compressed/pagetable.c | |
| parent | f1a5b53570001b1bcbf890ac6c4be1db99f8cc28 (diff) | |
| parent | 413d63d71b222108d19703f3fd5cf9108652a730 (diff) | |
| download | linux-next-3cb9bc85029f2ceb7a5babadcab445c7cb861da8.tar.gz | |
Merge branch 'x86/mm' into efi/core, to pick up dependencies
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/boot/compressed/pagetable.c')
| -rw-r--r-- | arch/x86/boot/compressed/pagetable.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/pagetable.c b/arch/x86/boot/compressed/pagetable.c index 28029be47fbb..f1aa43854bed 100644 --- a/arch/x86/boot/compressed/pagetable.c +++ b/arch/x86/boot/compressed/pagetable.c @@ -15,6 +15,13 @@ #define __pa(x) ((unsigned long)(x)) #define __va(x) ((void *)((unsigned long)(x))) +/* + * The pgtable.h and mm/ident_map.c includes make use of the SME related + * information which is not used in the compressed image support. Un-define + * the SME support to avoid any compile and link errors. + */ +#undef CONFIG_AMD_MEM_ENCRYPT + #include "misc.h" /* These actually do the work of building the kernel identity maps. */ |