diff options
| author | Rob Herring <robh@kernel.org> | 2022-01-12 17:14:09 +0100 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2022-01-12 17:14:09 +0100 |
| commit | e623611b4d3f722b57ceeaf4368ac787837408e7 (patch) | |
| tree | dfcea1c4db3f59b8d084f4ddc24dda6e6180e460 /drivers/firmware | |
| parent | dt-bindings: net: mdio: Drop resets/reset-names child properties (diff) | |
| parent | efi: apply memblock cap after memblock_add() (diff) | |
| download | linux-e623611b4d3f722b57ceeaf4368ac787837408e7.tar.xz linux-e623611b4d3f722b57ceeaf4368ac787837408e7.zip | |
Merge branch 'dt/linus' into dt/next
Pick a fix which didn't make it into v5.16.
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/efi/efi-init.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/firmware/efi/efi-init.c b/drivers/firmware/efi/efi-init.c index b19ce1a83f91..b2c829e95bd1 100644 --- a/drivers/firmware/efi/efi-init.c +++ b/drivers/firmware/efi/efi-init.c @@ -235,6 +235,11 @@ void __init efi_init(void) } reserve_regions(); + /* + * For memblock manipulation, the cap should come after the memblock_add(). + * And now, memblock is fully populated, it is time to do capping. + */ + early_init_dt_check_for_usable_mem_range(); efi_esrt_init(); efi_mokvar_table_init(); |