[PATCH 35/41] x86/alternatives: Move the tp_array manipulation into text_poke_int3_loc_init() and rename it to text_poke_int3_loc_add()

[Ingo Molnar]

This simplifies the code and code generation a bit:

   text	   data	    bss	    dec	    hex	filename
  14802	   1029	   4112	  19943	   4de7	alternative.o.before
  14784	   1029	   4112	  19925	   4dd5	alternative.o.after

Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
 arch/x86/kernel/alternative.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index 3ab40b0f5245..e1cc3e109feb 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -2752,12 +2752,14 @@ static void text_poke_int3_batch_process(void)
 	}
 }
 
-static void text_poke_int3_loc_init(struct text_poke_int3_loc *tp, void *addr,
-			       const void *opcode, size_t len, const void *emulate)
+static void text_poke_int3_loc_add(void *addr, const void *opcode, size_t len, const void *emulate)
 {
+	struct text_poke_int3_loc *tp;
 	struct insn insn;
 	int ret, i = 0;
 
+	tp = &tp_array.vec[tp_array.nr_entries++];
+
 	if (len == 6)
 		i = 1;
 	memcpy((void *)tp->text, opcode+i, len-i);
@@ -2873,12 +2875,9 @@ static void text_poke_int3_flush(void *addr)
 
 void __ref text_poke_int3_queue(void *addr, const void *opcode, size_t len, const void *emulate)
 {
-	struct text_poke_int3_loc *tp;
-
 	text_poke_int3_flush(addr);
 
-	tp = &tp_array.vec[tp_array.nr_entries++];
-	text_poke_int3_loc_init(tp, addr, opcode, len, emulate);
+	text_poke_int3_loc_add(addr, opcode, len, emulate);
 }
 
 /**
@@ -2894,13 +2893,10 @@ void __ref text_poke_int3_queue(void *addr, const void *opcode, size_t len, cons
  */
 void __ref text_poke_int3(void *addr, const void *opcode, size_t len, const void *emulate)
 {
-	struct text_poke_int3_loc *tp;
-
 	/* Batch-patching should not be mixed with single-patching: */
 	WARN_ON_ONCE(tp_array.nr_entries != 0);
 
-	tp = &tp_array.vec[tp_array.nr_entries++];
-	text_poke_int3_loc_init(tp, addr, opcode, len, emulate);
+	text_poke_int3_loc_add(addr, opcode, len, emulate);
 
 	text_poke_int3_finish();
 }
-- 
2.45.2