x86/alternatives: fixup alternative_call_2
PATCH 1/1 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(...);
Signed-off-by Alexey Dobriyan <[email protected]>
---
arch/x86/include/asm/alternative.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/x86/include/asm/alternative.h +1 -3
@@ -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
Quoted 7 lines · Alexey Dobriyan
The following pattern fails to compile while the same pattern with
alternative_call()does.if (...) alternative_call_2(...); else alternative_call_2(...);
Sigh. Can we get an explanation WHY it fails ?
Quoted 25 lines
Signed-off-by Alexey Dobriyan <[email protected]>---
arch/x86/include/asm/alternative.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)arch/x86/include/asm/alternative.h +1
-3@@ -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
PATCH v2 1/1 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 Alexey Dobriyan <[email protected]>
---
arch/x86/include/asm/alternative.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/x86/include/asm/alternative.h +1 -3
@@ -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
tip-bot for Alexey Dobriyan
merge bot[tip:x86/asm] x86/alternatives: Fixup alternative_call_2
x86/alternatives: Fixup alternative_call_2
Commit-ID: 668120ab7ee4db67618ec75a0ebc93eae6c70034 Gitweb: https://git.kernel.org/tip/668120ab7ee4db67618ec75a0ebc93eae6c70034 Author: Alexey Dobriyan <[email protected]> AuthorDate: Sun, 14 Jan 2018 15:05:04 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 26 Mar 2018 12:32:40 +0200
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 Alexey Dobriyan <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Acked-by Borislav Petkov <[email protected]>
--- arch/x86/include/asm/alternative.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/x86/include/asm/alternative.h +1 -3
@@ -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
tip-bot for Alexey Dobriyan
merge bot[tip:x86/pti] x86/alternatives: Fixup alternative_call_2
In reply to Alexey Dobriyanx86/alternatives: Fixup alternative_call_2
Commit-ID: bd6271039ee6f0c9b468148fc2d73e0584af6b4f Gitweb: https://git.kernel.org/tip/bd6271039ee6f0c9b468148fc2d73e0584af6b4f Author: Alexey Dobriyan <[email protected]> AuthorDate: Sun, 14 Jan 2018 15:05:04 +0300 Committer: Thomas Gleixner <[email protected]> CommitDate: Tue, 27 Mar 2018 09:47:53 +0200
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 Alexey Dobriyan <[email protected]>
Signed-off-by Thomas Gleixner <[email protected]>
Acked-by Borislav Petkov <[email protected]>
--- arch/x86/include/asm/alternative.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
arch/x86/include/asm/alternative.h +1 -3
@@ -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