* [PATCH] x86: fix alternative_callN
@ 2019-05-22 16:38 Roger Pau Monne
2019-05-22 16:38 ` [Xen-devel] " Roger Pau Monne
2019-05-22 16:43 ` Roger Pau Monné
0 siblings, 2 replies; 4+ messages in thread
From: Roger Pau Monne @ 2019-05-22 16:38 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Wei Liu, Jan Beulich, Roger Pau Monne
alternative_callN using inline assemble to generate the alternative
patch sites should be using the ALTERNATIVE C preprocessor macro
rather than the ALTERNATIVE assembly macro, the more that using the
assembly macro in an inline assembly instance causes the following
error on llvm based toolchains:
<instantiation>:1:1: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:37: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<inline asm>:1:2: note: while in macro instantiation
ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
^
<instantiation>:1:156: error: invalid symbol redefinition
...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
^
<instantiation>:18:5: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
<instantiation>:18:26: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
<instantiation>:1:1: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:37: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<inline asm>:1:2: note: while in macro instantiation
ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
^
<instantiation>:1:156: error: invalid symbol redefinition
...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
^
<instantiation>:18:5: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
<instantiation>:18:26: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
<instantiation>:1:1: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:37: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<inline asm>:1:2: note: while in macro instantiation
ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
^
<instantiation>:1:156: error: invalid symbol redefinition
...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
^
<instantiation>:18:5: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
<instantiation>:18:26: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
Fixes: 67d01cdb5 ("x86: infrastructure to allow converting certain indirect calls to direct ones")
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
xen/include/asm-x86/alternative.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h
index 63d0a450ba..92e3581bc2 100644
--- a/xen/include/asm-x86/alternative.h
+++ b/xen/include/asm-x86/alternative.h
@@ -202,9 +202,8 @@ extern void alternative_branches(void);
rettype ret_; \
register unsigned long r10_ asm("r10"); \
register unsigned long r11_ asm("r11"); \
- asm volatile (__stringify(ALTERNATIVE "call *%c[addr](%%rip)", \
- "call .", \
- X86_FEATURE_ALWAYS) \
+ asm volatile (ALTERNATIVE("call *%c[addr](%%rip)", "call .", \
+ X86_FEATURE_ALWAYS) \
: ALT_CALL ## n ## _OUT, "=a" (ret_), \
"=r" (r10_), "=r" (r11_) ASM_CALL_CONSTRAINT \
: [addr] "i" (&(func)), "g" (func) \
--
2.20.1 (Apple Git-117)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Xen-devel] [PATCH] x86: fix alternative_callN
2019-05-22 16:38 [PATCH] x86: fix alternative_callN Roger Pau Monne
@ 2019-05-22 16:38 ` Roger Pau Monne
2019-05-22 16:43 ` Roger Pau Monné
1 sibling, 0 replies; 4+ messages in thread
From: Roger Pau Monne @ 2019-05-22 16:38 UTC (permalink / raw)
To: xen-devel; +Cc: Andrew Cooper, Wei Liu, Jan Beulich, Roger Pau Monne
alternative_callN using inline assemble to generate the alternative
patch sites should be using the ALTERNATIVE C preprocessor macro
rather than the ALTERNATIVE assembly macro, the more that using the
assembly macro in an inline assembly instance causes the following
error on llvm based toolchains:
<instantiation>:1:1: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:37: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<inline asm>:1:2: note: while in macro instantiation
ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
^
<instantiation>:1:156: error: invalid symbol redefinition
...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
^
<instantiation>:18:5: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
<instantiation>:18:26: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
<instantiation>:1:1: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:37: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<inline asm>:1:2: note: while in macro instantiation
ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
^
<instantiation>:1:156: error: invalid symbol redefinition
...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
^
<instantiation>:18:5: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
<instantiation>:18:26: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
<instantiation>:1:1: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:37: error: invalid symbol redefinition
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
.L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
^
<inline asm>:1:2: note: while in macro instantiation
ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
^
<instantiation>:1:156: error: invalid symbol redefinition
...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
^
<instantiation>:18:5: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
<instantiation>:18:26: error: invalid symbol redefinition
.L0_repl_s1: call .; .L0_repl_e1:
^
Fixes: 67d01cdb5 ("x86: infrastructure to allow converting certain indirect calls to direct ones")
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Wei Liu <wei.liu2@citrix.com>
---
xen/include/asm-x86/alternative.h | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h
index 63d0a450ba..92e3581bc2 100644
--- a/xen/include/asm-x86/alternative.h
+++ b/xen/include/asm-x86/alternative.h
@@ -202,9 +202,8 @@ extern void alternative_branches(void);
rettype ret_; \
register unsigned long r10_ asm("r10"); \
register unsigned long r11_ asm("r11"); \
- asm volatile (__stringify(ALTERNATIVE "call *%c[addr](%%rip)", \
- "call .", \
- X86_FEATURE_ALWAYS) \
+ asm volatile (ALTERNATIVE("call *%c[addr](%%rip)", "call .", \
+ X86_FEATURE_ALWAYS) \
: ALT_CALL ## n ## _OUT, "=a" (ret_), \
"=r" (r10_), "=r" (r11_) ASM_CALL_CONSTRAINT \
: [addr] "i" (&(func)), "g" (func) \
--
2.20.1 (Apple Git-117)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] x86: fix alternative_callN
2019-05-22 16:38 [PATCH] x86: fix alternative_callN Roger Pau Monne
2019-05-22 16:38 ` [Xen-devel] " Roger Pau Monne
@ 2019-05-22 16:43 ` Roger Pau Monné
2019-05-22 16:43 ` [Xen-devel] " Roger Pau Monné
1 sibling, 1 reply; 4+ messages in thread
From: Roger Pau Monné @ 2019-05-22 16:43 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Wei Liu, Jan Beulich, Andrew Cooper
Forget about this version, I've updated the subject and commit
message and forgot to re-generate the patch.
On Wed, May 22, 2019 at 05:38:10PM +0100, Roger Pau Monne wrote:
> alternative_callN using inline assemble to generate the alternative
> patch sites should be using the ALTERNATIVE C preprocessor macro
> rather than the ALTERNATIVE assembly macro, the more that using the
> assembly macro in an inline assembly instance causes the following
> error on llvm based toolchains:
>
> <instantiation>:1:1: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:37: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <inline asm>:1:2: note: while in macro instantiation
> ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
> ^
> <instantiation>:1:156: error: invalid symbol redefinition
> ...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
> ^
> <instantiation>:18:5: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
> <instantiation>:18:26: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
> <instantiation>:1:1: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:37: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <inline asm>:1:2: note: while in macro instantiation
> ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
> ^
> <instantiation>:1:156: error: invalid symbol redefinition
> ...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
> ^
> <instantiation>:18:5: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
> <instantiation>:18:26: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
> <instantiation>:1:1: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:37: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <inline asm>:1:2: note: while in macro instantiation
> ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
> ^
> <instantiation>:1:156: error: invalid symbol redefinition
> ...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
> ^
> <instantiation>:18:5: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
> <instantiation>:18:26: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
>
> Fixes: 67d01cdb5 ("x86: infrastructure to allow converting certain indirect calls to direct ones")
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> ---
> Cc: Jan Beulich <jbeulich@suse.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> ---
> xen/include/asm-x86/alternative.h | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h
> index 63d0a450ba..92e3581bc2 100644
> --- a/xen/include/asm-x86/alternative.h
> +++ b/xen/include/asm-x86/alternative.h
> @@ -202,9 +202,8 @@ extern void alternative_branches(void);
> rettype ret_; \
> register unsigned long r10_ asm("r10"); \
> register unsigned long r11_ asm("r11"); \
> - asm volatile (__stringify(ALTERNATIVE "call *%c[addr](%%rip)", \
> - "call .", \
> - X86_FEATURE_ALWAYS) \
> + asm volatile (ALTERNATIVE("call *%c[addr](%%rip)", "call .", \
> + X86_FEATURE_ALWAYS) \
> : ALT_CALL ## n ## _OUT, "=a" (ret_), \
> "=r" (r10_), "=r" (r11_) ASM_CALL_CONSTRAINT \
> : [addr] "i" (&(func)), "g" (func) \
> --
> 2.20.1 (Apple Git-117)
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Xen-devel] [PATCH] x86: fix alternative_callN
2019-05-22 16:43 ` Roger Pau Monné
@ 2019-05-22 16:43 ` Roger Pau Monné
0 siblings, 0 replies; 4+ messages in thread
From: Roger Pau Monné @ 2019-05-22 16:43 UTC (permalink / raw)
To: Roger Pau Monne; +Cc: xen-devel, Wei Liu, Jan Beulich, Andrew Cooper
Forget about this version, I've updated the subject and commit
message and forgot to re-generate the patch.
On Wed, May 22, 2019 at 05:38:10PM +0100, Roger Pau Monne wrote:
> alternative_callN using inline assemble to generate the alternative
> patch sites should be using the ALTERNATIVE C preprocessor macro
> rather than the ALTERNATIVE assembly macro, the more that using the
> assembly macro in an inline assembly instance causes the following
> error on llvm based toolchains:
>
> <instantiation>:1:1: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:37: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <inline asm>:1:2: note: while in macro instantiation
> ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
> ^
> <instantiation>:1:156: error: invalid symbol redefinition
> ...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
> ^
> <instantiation>:18:5: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
> <instantiation>:18:26: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
> <instantiation>:1:1: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:37: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <inline asm>:1:2: note: while in macro instantiation
> ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
> ^
> <instantiation>:1:156: error: invalid symbol redefinition
> ...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
> ^
> <instantiation>:18:5: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
> <instantiation>:18:26: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
> <instantiation>:1:1: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:37: error: invalid symbol redefinition
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <instantiation>:1:60: error: invalid reassignment of non-absolute variable '.L0_diff'
> .L0_orig_s: call *genapic+64(%rip); .L0_orig_e: .L0_diff = (.L0_repl_e1 - .L0_repl_s1) - (...
> ^
> <inline asm>:1:2: note: while in macro instantiation
> ALTERNATIVE "call *genapic+64(%rip)", "call .", X86_FEATURE_LM
> ^
> <instantiation>:1:156: error: invalid symbol redefinition
> ...- (.L0_orig_e - .L0_orig_s); mknops ((-(.L0_diff > 0)) * .L0_diff); .L0_orig_p:
> ^
> <instantiation>:18:5: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
> <instantiation>:18:26: error: invalid symbol redefinition
> .L0_repl_s1: call .; .L0_repl_e1:
> ^
>
> Fixes: 67d01cdb5 ("x86: infrastructure to allow converting certain indirect calls to direct ones")
> Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
> ---
> Cc: Jan Beulich <jbeulich@suse.com>
> Cc: Andrew Cooper <andrew.cooper3@citrix.com>
> Cc: Wei Liu <wei.liu2@citrix.com>
> ---
> xen/include/asm-x86/alternative.h | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/xen/include/asm-x86/alternative.h b/xen/include/asm-x86/alternative.h
> index 63d0a450ba..92e3581bc2 100644
> --- a/xen/include/asm-x86/alternative.h
> +++ b/xen/include/asm-x86/alternative.h
> @@ -202,9 +202,8 @@ extern void alternative_branches(void);
> rettype ret_; \
> register unsigned long r10_ asm("r10"); \
> register unsigned long r11_ asm("r11"); \
> - asm volatile (__stringify(ALTERNATIVE "call *%c[addr](%%rip)", \
> - "call .", \
> - X86_FEATURE_ALWAYS) \
> + asm volatile (ALTERNATIVE("call *%c[addr](%%rip)", "call .", \
> + X86_FEATURE_ALWAYS) \
> : ALT_CALL ## n ## _OUT, "=a" (ret_), \
> "=r" (r10_), "=r" (r11_) ASM_CALL_CONSTRAINT \
> : [addr] "i" (&(func)), "g" (func) \
> --
> 2.20.1 (Apple Git-117)
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-05-22 16:44 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-22 16:38 [PATCH] x86: fix alternative_callN Roger Pau Monne
2019-05-22 16:38 ` [Xen-devel] " Roger Pau Monne
2019-05-22 16:43 ` Roger Pau Monné
2019-05-22 16:43 ` [Xen-devel] " Roger Pau Monné
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).