Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6e54d95f authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Support alternative() with a output argument. 



Needed for follow on patches

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 737c5c3b

include/asm-x86_64/system.h

+15 −0
Original line number Diff line number Diff line
@@ -137,6 +137,21 @@ struct alt_instr { 
		      "663:\n\t" newinstr "\n664:\n"   /* replacement */ \

		      ".previous" :: "i" (feature), ##input)



/* Like alternative_input, but with a single output argument */

#define alternative_io(oldinstr, newinstr, feature, output, input...) \

	asm volatile ("661:\n\t" oldinstr "\n662:\n"			\

		      ".section .altinstructions,\"a\"\n"		\

		      "  .align 8\n"					\

		      "  .quad 661b\n"            /* label */		\

		      "  .quad 663f\n"		  /* new instruction */	\

		      "  .byte %c[feat]\n"        /* feature bit */	\

		      "  .byte 662b-661b\n"       /* sourcelen */	\

		      "  .byte 664f-663f\n"       /* replacementlen */	\

		      ".previous\n"					\

		      ".section .altinstr_replacement,\"ax\"\n"		\

		      "663:\n\t" newinstr "\n664:\n"   /* replacement */ \

		      ".previous" : output : [feat] "i" (feature), ##input)



/*

 * Clear and set 'TS' bit respectively

 */