diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-02 14:58:33 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-02 14:58:33 -0400 |
| commit | 945ffacc1a7c6fc62b768c3b2dde4e3bb07b9a36 (patch) | |
| tree | 223dc8e34e0a99263b1bbd2740deb08f82ba5432 | |
| parent | a2bbc604e19d6cb05c106e8556d024e6587ab96d (diff) | |
| download | longterm-queue-4.8-945ffacc1a7c6fc62b768c3b2dde4e3bb07b9a36.tar.gz | |
KASLR: refresh for IS_ENABLED vs. config_enabled
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/x86-mm-KASLR-Exclude-EFI-region-from-KASLR-VA-space-.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/queue/x86-mm-KASLR-Exclude-EFI-region-from-KASLR-VA-space-.patch b/queue/x86-mm-KASLR-Exclude-EFI-region-from-KASLR-VA-space-.patch index 711238e..2780b69 100644 --- a/queue/x86-mm-KASLR-Exclude-EFI-region-from-KASLR-VA-space-.patch +++ b/queue/x86-mm-KASLR-Exclude-EFI-region-from-KASLR-VA-space-.patch @@ -1,4 +1,4 @@ -From a46f60d76004965e5669dbf3fc21ef3bc3632eb4 Mon Sep 17 00:00:00 2001 +From 0fba384b7e49a31bf2955843a1d19931560e69cc Mon Sep 17 00:00:00 2001 From: Baoquan He <bhe@redhat.com> Date: Fri, 24 Mar 2017 12:59:52 +0800 Subject: [PATCH] x86/mm/KASLR: Exclude EFI region from KASLR VA space @@ -48,7 +48,7 @@ Link: http://lkml.kernel.org/r/1490331592-31860-1-git-send-email-bhe@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org> diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c -index 887e57182716..aed206475aa7 100644 +index ddd2661c4502..4383cd83f027 100644 --- a/arch/x86/mm/kaslr.c +++ b/arch/x86/mm/kaslr.c @@ -48,7 +48,7 @@ static const unsigned long vaddr_start = __PAGE_OFFSET_BASE; @@ -63,11 +63,11 @@ index 887e57182716..aed206475aa7 100644 @@ -105,7 +105,7 @@ void __init kernel_randomize_memory(void) */ BUILD_BUG_ON(vaddr_start >= vaddr_end); - BUILD_BUG_ON(IS_ENABLED(CONFIG_X86_ESPFIX64) && + BUILD_BUG_ON(config_enabled(CONFIG_X86_ESPFIX64) && - vaddr_end >= EFI_VA_START); + vaddr_end >= EFI_VA_END); - BUILD_BUG_ON((IS_ENABLED(CONFIG_X86_ESPFIX64) || - IS_ENABLED(CONFIG_EFI)) && + BUILD_BUG_ON((config_enabled(CONFIG_X86_ESPFIX64) || + config_enabled(CONFIG_EFI)) && vaddr_end >= __START_KERNEL_map); -- 2.12.0 |