diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-21 16:01:47 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2025-02-21 16:01:47 +0300 |
| commit | d75eaaf3354d78cc79c6d49b7f23f171b34a9651 (patch) | |
| tree | 58966f3ce63786e552e9e250a854e1f83d1fe1ab /drivers/firmware/efi/libstub/randomalloc.c | |
| parent | aaa0c79b32d43b30dcc2b9059eacc11e995ca773 (diff) | |
| parent | 19b4657de424f48a588eb379fe3214d317f46cd7 (diff) | |
| download | linux-d75eaaf3354d78cc79c6d49b7f23f171b34a9651.tar.xz | |
Merge v6.12.16
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/firmware/efi/libstub/randomalloc.c')
| -rw-r--r-- | drivers/firmware/efi/libstub/randomalloc.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/firmware/efi/libstub/randomalloc.c b/drivers/firmware/efi/libstub/randomalloc.c index c41e7b2091cd..8ad3efb9b1ff 100644 --- a/drivers/firmware/efi/libstub/randomalloc.c +++ b/drivers/firmware/efi/libstub/randomalloc.c @@ -25,6 +25,9 @@ static unsigned long get_entry_num_slots(efi_memory_desc_t *md, if (md->type != EFI_CONVENTIONAL_MEMORY) return 0; + if (md->attribute & EFI_MEMORY_HOT_PLUGGABLE) + return 0; + if (efi_soft_reserve_enabled() && (md->attribute & EFI_MEMORY_SP)) return 0; |