[PATCH 41/41] x86/alternatives: Simplify tp_addr_ordered()

Ingo Molnar posted 41 patches 8 months, 3 weeks ago
[PATCH 41/41] x86/alternatives: Simplify tp_addr_ordered()
Posted by Ingo Molnar 8 months, 3 weeks ago
 - Use direct 'void *' pointer comparison, there's no
   need to force the type to 'unsigned long'.

 - Remove the 'tp' local variable indirection

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 arch/x86/kernel/alternative.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 32d3707d7963..7367c829a4fb 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -2838,8 +2838,6 @@ static void text_poke_int3_loc_add(void *addr, const void *opcode, size_t len, c
  */
 static bool tp_addr_ordered(void *addr)
 {
-	struct text_poke_int3_loc *tp;
-
 	WARN_ON_ONCE(!addr);
 
 	if (!tp_array.nr_entries)
@@ -2851,8 +2849,7 @@ static bool tp_addr_ordered(void *addr)
 	 * is violated and we must first flush all pending patching
 	 * requests:
 	 */
-	tp = &tp_array.vec[tp_array.nr_entries-1];
-	if ((unsigned long)text_poke_int3_addr(tp) > (unsigned long)addr)
+	if (text_poke_int3_addr(tp_array.vec + tp_array.nr_entries-1) > addr)
 		return false;
 
 	return true;
-- 
2.45.2