diff options
| author | Ingo Molnar <mingo@kernel.org> | 2025-05-06 12:03:03 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2025-05-06 12:03:03 +0200 |
| commit | 83725bdf94c3b5fc7ff235750093805c6bc599fe (patch) | |
| tree | 67cd5a289fde8eff944c5e4e9cd1202e09e34ce9 /arch/x86/platform | |
| parent | x86/asm: Rename rep_nop() to native_pause() (diff) | |
| parent | Linux 6.15-rc4 (diff) | |
| download | linux-83725bdf94c3b5fc7ff235750093805c6bc599fe.tar.gz linux-83725bdf94c3b5fc7ff235750093805c6bc599fe.zip | |
Merge tag 'v6.15-rc4' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform')
| -rw-r--r-- | arch/x86/platform/efi/efi_64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/platform/efi/efi_64.c b/arch/x86/platform/efi/efi_64.c index ac57259a432b..a4b4ebd41b8f 100644 --- a/arch/x86/platform/efi/efi_64.c +++ b/arch/x86/platform/efi/efi_64.c @@ -73,7 +73,7 @@ int __init efi_alloc_page_tables(void) gfp_t gfp_mask; gfp_mask = GFP_KERNEL | __GFP_ZERO; - efi_pgd = (pgd_t *)__get_free_pages(gfp_mask, PGD_ALLOCATION_ORDER); + efi_pgd = (pgd_t *)__get_free_pages(gfp_mask, pgd_allocation_order()); if (!efi_pgd) goto fail; @@ -96,7 +96,7 @@ free_p4d: if (pgtable_l5_enabled()) free_page((unsigned long)pgd_page_vaddr(*pgd)); free_pgd: - free_pages((unsigned long)efi_pgd, PGD_ALLOCATION_ORDER); + free_pages((unsigned long)efi_pgd, pgd_allocation_order()); fail: return -ENOMEM; } |