[PATCH 6/8] x86/asm: Use unique code labels in __FILL_RETURN_BUFFER

Josh Poimboeuf posted 8 patches 1 week, 5 days ago
[PATCH 6/8] x86/asm: Use unique code labels in __FILL_RETURN_BUFFER
Posted by Josh Poimboeuf 1 week, 5 days ago
In preparation for unifying the C and asm alternative implementations,
change the code labels in __FILL_RETURN_BUFFER to be unique.  The 771
and 772 labels are used by the C alternative implementation, which will
soon be extended for asm.

Signed-off-by: Josh Poimboeuf <jpoimboe@kernel.org>
---
 arch/x86/include/asm/nospec-branch.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h
index a5d41d8cd70a..334c6058a1ec 100644
--- a/arch/x86/include/asm/nospec-branch.h
+++ b/arch/x86/include/asm/nospec-branch.h
@@ -126,9 +126,9 @@
  */
 #define __FILL_RETURN_SLOT			\
 	ANNOTATE_INTRA_FUNCTION_CALL;		\
-	call	772f;				\
+	call	872f;				\
 	int3;					\
-772:
+872:
 
 /*
  * Stuff the entire RSB.
@@ -140,12 +140,12 @@
 #ifdef CONFIG_X86_64
 #define __FILL_RETURN_BUFFER(reg, nr)			\
 	mov	$(nr/2), reg;				\
-771:							\
+871:							\
 	__FILL_RETURN_SLOT				\
 	__FILL_RETURN_SLOT				\
 	add	$(BITS_PER_LONG/8) * 2, %_ASM_SP;	\
 	dec	reg;					\
-	jnz	771b;					\
+	jnz	871b;					\
 	/* barrier for jnz misprediction */		\
 	lfence;						\
 	CREDIT_CALL_DEPTH				\
-- 
2.52.0