diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-28 02:03:20 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-06-28 02:03:20 +0300 |
| commit | 18eb3b6dff007f2e4ef4f0d8567dfb5cdb6086fc (patch) | |
| tree | a8d5001b1bfd9d1f1975b08069a95313242801eb /arch/x86/kernel/setup.c | |
| parent | 6a46676994607a1bde51cba71c1b0d373a555f45 (diff) | |
| parent | fb9b7b4b2b82d72031bff6d615215c1c74064bb3 (diff) | |
| download | linux-18eb3b6dff007f2e4ef4f0d8567dfb5cdb6086fc.tar.xz | |
Merge tag 'for-linus-6.5-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen updates from Juergen Gross:
- three patches adding missing prototypes
- a fix for finding the iBFT in a Xen dom0 for supporting diskless
iSCSI boot
* tag 'for-linus-6.5-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
x86: xen: add missing prototypes
x86/xen: add prototypes for paravirt mmu functions
iscsi_ibft: Fix finding the iBFT under Xen Dom 0
xen: xen_debug_interrupt prototype to global header
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 0cccfeb67c3a..fd975a4a5200 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -796,7 +796,6 @@ static void __init early_reserve_memory(void) memblock_x86_reserve_range_setup_data(); - reserve_ibft_region(); reserve_bios_regions(); trim_snb_memory(); } @@ -1032,6 +1031,7 @@ void __init setup_arch(char **cmdline_p) if (efi_enabled(EFI_BOOT)) efi_init(); + reserve_ibft_region(); dmi_setup(); /* |