diff options
| author |   Arvind Sankar <nivedita@alum.mit.edu> | 2020-07-28 18:57:12 -0400 |
|---|---|---|
| committer |   Ingo Molnar <mingo@kernel.org> | 2020-07-31 11:08:17 +0200 |
| commit | 50def2693a900dfb1d91872056dc8164245820fc (patch) | |
| tree | 43faad561938da02c8f1d70a2120ca75b19ae73e | |
| parent | x86/kaslr: Fix off-by-one error in process_gb_huge_pages() (diff) | |
| download | linux-dev-50def2693a900dfb1d91872056dc8164245820fc.tar.xz linux-dev-50def2693a900dfb1d91872056dc8164245820fc.zip | |
x86/kaslr: Short-circuit gb_huge_pages on x86-32
32-bit does not have GB pages, so don't bother checking for them. Using
the IS_ENABLED() macro allows the compiler to completely remove the
gb_huge_pages code.
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20200728225722.67457-12-nivedita@alum.mit.edu
| -rw-r--r-- | arch/x86/boot/compressed/kaslr.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/boot/compressed/kaslr.c b/arch/x86/boot/compressed/kaslr.c index 0df513e3e2ce..3727e9708690 100644 --- a/arch/x86/boot/compressed/kaslr.c +++ b/arch/x86/boot/compressed/kaslr.c @@ -303,7 +303,7 @@ static void handle_mem_options(void) if (!strcmp(param, "memmap")) { mem_avoid_memmap(PARSE_MEMMAP, val); - } else if (strstr(param, "hugepages")) { + } else if (IS_ENABLED(CONFIG_X86_64) && strstr(param, "hugepages")) { parse_gb_huge_pages(param, val); } else if (!strcmp(param, "mem")) { char *p = val; @@ -551,7 +551,7 @@ process_gb_huge_pages(struct mem_vector *region, unsigned long image_size) struct mem_vector tmp; int i = 0; - if (!max_gb_huge_pages) { + if (!IS_ENABLED(CONFIG_X86_64) || !max_gb_huge_pages) { store_slot_info(region, image_size); return; } |