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

Commit bd627103 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Thomas Gleixner
Browse files

x86/alternatives: Fixup alternative_call_2 



The following pattern fails to compile while the same pattern
with alternative_call() does:

	if (...)
		alternative_call_2(...);
	else
		alternative_call_2(...);

as it expands into

	if (...)
	{
	};	<===
	else
	{
	};

Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarBorislav Petkov <bp@suse.de>
Link: https://lkml.kernel.org/r/20180114120504.GA11368@avx2
parent 3c1f0583

arch/x86/include/asm/alternative.h

+1 −3
Original line number Diff line number Diff line
@@ -218,13 +218,11 @@ static inline int alternatives_text_reserved(void *start, void *end) 
 */

#define alternative_call_2(oldfunc, newfunc1, feature1, newfunc2, feature2,   \

			   output, input...)				      \

{									      \

	asm volatile (ALTERNATIVE_2("call %P[old]", "call %P[new1]", feature1,\

		"call %P[new2]", feature2)				      \

		: output, ASM_CALL_CONSTRAINT				      \

		: [old] "i" (oldfunc), [new1] "i" (newfunc1),		      \

		  [new2] "i" (newfunc2), ## input);			      \

}

		  [new2] "i" (newfunc2), ## input)



/*

 * use this macro(s) if you need more than one output parameter