diff options
| author | Ingo Molnar <mingo@kernel.org> | 2023-10-09 18:09:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2023-10-09 18:09:23 +0200 |
| commit | fdb8b7a1af31d69ee1c8ddc02926cb409eaaecc3 (patch) | |
| tree | 9af7010f5f93005adbf6f98c6557552b86d32697 /arch/x86/kernel/setup.c | |
| parent | 0cff993e08a7578e2c1df93a95fc5059f447e7ae (diff) | |
| parent | 94f6f0550c625fab1f373bb86a6669b45e9748b3 (diff) | |
Merge tag 'v6.6-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index b9145a63da77..b098b1fa2470 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -358,15 +358,11 @@ static void __init add_early_ima_buffer(u64 phys_addr) #if defined(CONFIG_HAVE_IMA_KEXEC) && !defined(CONFIG_OF_FLATTREE) int __init ima_free_kexec_buffer(void) { - int rc; - if (!ima_kexec_buffer_size) return -ENOENT; - rc = memblock_phys_free(ima_kexec_buffer_phys, - ima_kexec_buffer_size); - if (rc) - return rc; + memblock_free_late(ima_kexec_buffer_phys, + ima_kexec_buffer_size); ima_kexec_buffer_phys = 0; ima_kexec_buffer_size = 0; |