aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/platform
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2025-12-14 09:33:26 +0100
committerIngo Molnar <mingo@kernel.org>2025-12-14 09:33:26 +0100
commit050d30afc94a6aa8e7e953d4d88e02c2d7d81485 (patch)
tree1c2c402abaf4a3da203918d0c32510790fa93feb /arch/x86/platform
parent18374064726bc581f28fed63f5e2fd96d810ca7e (diff)
parent6c08d768a528ad22016850a481d67bfc8cdb9d4b (diff)
downloadtip-master.tar.gz
Merge branch into tip/master: 'x86/boot'HEADmaster
# New commits in x86/boot: 6c08d768a528 ("x86/boot/e820: Use <linux/sizes.h> symbols for literals") 0d9daff41418 ("x86/boot/e820: Make sure e820_search_gap() finds all gaps") 4ad03f133c9e ("x86/boot/e820: Simplify the e820__range_remove() API") 8b886d8a4db9 ("x86/boot/e820: Remove e820__range_remove()'s unused return parameter") 157266edcc56 ("x86/boot/e820: Simplify append_e820_table() and remove restriction on single-entry tables") af0cf1646d9d ("x86/boot/e820: Standardize __init/__initdata tag placement") 7df2f811b275 ("x86/boot/e820: Simplify & clarify __e820__range_add() a bit") 95060e411ffd ("x86/boot/e820: Rename gap_start/gap_size to max_gap_start/max_gap_start in e820_search_gap() et al") f40f3f32b345 ("x86/boot/e820: Change e820_search_gap() to search for the highest-address PCI gap") cff02bff04f2 ("x86/boot/e820: Clean up e820__setup_pci_gap()/e820_search_gap() a bit") 46f3e7d394b2 ("x86/boot/e820: Change struct e820_table::nr_entries type from __u32 to u32") 58dcd82d2e25 ("x86/boot/e820: Standardize e820 table index variable types under 'u32'") dc043d6463bf ("x86/boot/e820: Standardize e820 table index variable names under 'idx'") a515ca9664fb ("x86/boot/e820: Remove unnecessary header inclusions") 2774ae1046fb ("x86/boot/e820: Clean up __refdata use a bit") a4803df3a2b1 ("x86/boot/e820: Clean up __e820__range_add() a bit") 4a7a13e04c05 ("x86/boot/e820: Improve e820_print_type() messages") 44f732f3ec82 ("x86/boot/e820: Clean up confusing and self-contradictory verbiage around E820 related resource allocations") d214484f50f4 ("x86/boot/e820: Remove pointless early_panic() indirection") eea78dc546a9 ("x86/boot/e820: Use 'u64' consistently instead of 'unsigned long long'") 1d7bc219e2b6 ("x86/boot/e820: Call the PCI gap a 'gap' in the boot log printout") fa06d58805c8 ("x86/boot/e820: Print E820_TYPE_RAM entries as ... RAM entries") c87f94477740 ("x86/boot/e820: Make the field separator space character part of e820_print_type()") 4d8e5a682be4 ("x86/boot/e820: Print gaps in the E820 table") 3e57abd4556b ("x86/boot/e820: Mark e820__print_table() static") 3814bf08452e ("x86/boot/e820: Simplify the PPro Erratum #50 workaround") 0bb4a8bdbd22 ("x86/boot/e820: Simplify e820__print_table() a bit") db0d69c5700b ("x86/boot/e820: Remove inverted boolean logic from the e820_nomerge() function name, rename it to e820_type_mergeable()") adbf61cc47cb ("x86/acpi/boot: Correct acpi_is_processor_usable() check again") Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/platform')
-rw-r--r--arch/x86/platform/efi/efi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 463b784499a8f5..d00c6de7f3b733 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -333,8 +333,7 @@ static void __init efi_remove_e820_mmio(void)
if (size >= 256*1024) {
pr_info("Remove mem%02u: MMIO range=[0x%08llx-0x%08llx] (%lluMB) from e820 map\n",
i, start, end, size >> 20);
- e820__range_remove(start, size,
- E820_TYPE_RESERVED, 1);
+ e820__range_remove(start, size, E820_TYPE_RESERVED);
} else {
pr_info("Not removing mem%02u: MMIO range=[0x%08llx-0x%08llx] (%lluKB) from e820 map\n",
i, start, end, size >> 10);