[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <fcbb2f57-0714-4139-b441-8817365c16a1@stanley.mountain>
Date: Wed, 19 Feb 2025 16:48:49 +0300
From: Dan Carpenter <dan.carpenter@...aro.org>
To: Thomas Gleixner <tglx@...utronix.de>
Cc: Ingo Molnar <mingo@...hat.com>, Borislav Petkov <bp@...en8.de>,
Dave Hansen <dave.hansen@...ux.intel.com>, x86@...nel.org,
"H. Peter Anvin" <hpa@...or.com>,
"Mike Rapoport (Microsoft)" <rppt@...nel.org>,
Peter Zijlstra <peterz@...radead.org>,
Luis Chamberlain <mcgrof@...nel.org>, Will Deacon <will@...nel.org>,
Song Liu <song@...nel.org>, linux-kernel@...r.kernel.org,
kernel-janitors@...r.kernel.org
Subject: [PATCH] x86/module: remove unnecessary check in module_finalize()
The "calls" pointer can no longer be NULL after commit ab9fea59487d
("x86/alternative: Simplify callthunk patching") was merged. Delete
this unnecessary check.
Signed-off-by: Dan Carpenter <dan.carpenter@...aro.org>
---
arch/x86/kernel/module.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
index cb9d295e67cb..615f74c4bd6c 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -278,10 +278,8 @@ int module_finalize(const Elf_Ehdr *hdr,
if (calls) {
struct callthunk_sites cs = {};
- if (calls) {
- cs.call_start = (void *)calls->sh_addr;
- cs.call_end = (void *)calls->sh_addr + calls->sh_size;
- }
+ cs.call_start = (void *)calls->sh_addr;
+ cs.call_end = (void *)calls->sh_addr + calls->sh_size;
callthunks_patch_module_calls(&cs, me);
}
--
2.47.2
Powered by blists - more mailing lists