[xen master] x86: fix indirect thunk usage of CONFIG_INDIRECT_THUNK

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[xen master] x86: fix indirect thunk usage of CONFIG_INDIRECT_THUNK

patchbot
commit 0ace9284f09182ed5c5d1f077f5924252dbcb07e
Author:     Roger Pau Monné <[hidden email]>
AuthorDate: Fri Feb 23 11:00:31 2018 +0100
Commit:     Jan Beulich <[hidden email]>
CommitDate: Fri Feb 23 11:00:31 2018 +0100

    x86: fix indirect thunk usage of CONFIG_INDIRECT_THUNK
   
    When indirect_thunk_asm.h is instantiated directly into assembly files
    CONFIG_INDIRECT_THUNK might not be defined, and thus using .if against
    it is wrong.
   
    Add a check to define CONFIG_INDIRECT_THUNK to 0 if not defined, so
    that using .if CONFIG_INDIRECT_THUNK is always correct.
   
    This suppresses the following clang error:
   
    <instantiation>:8:9: error: expected absolute expression
        .if CONFIG_INDIRECT_THUNK == 1
            ^
    <instantiation>:1:1: note: while in macro instantiation
    INDIRECT_BRANCH call %rdx
    ^
    entry.S:589:9: note: while in macro instantiation
            INDIRECT_CALL %rdx
            ^
   
    Note that this is a preparatory patch in order to enable clang's
    integrated assembler, the integrated assembler is not yet enabled for
    assembly files.
   
    Signed-off-by: Roger Pau Monné <[hidden email]>
    Acked-by: Jan Beulich <[hidden email]>
---
 xen/include/asm-x86/asm_defns.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/xen/include/asm-x86/asm_defns.h b/xen/include/asm-x86/asm_defns.h
index 6fc13d3..ebd2c88 100644
--- a/xen/include/asm-x86/asm_defns.h
+++ b/xen/include/asm-x86/asm_defns.h
@@ -15,6 +15,9 @@
 #include <asm/alternative.h>
 
 #ifdef __ASSEMBLY__
+#ifndef CONFIG_INDIRECT_THUNK
+.equ CONFIG_INDIRECT_THUNK, 0
+#endif
 # include <asm/indirect_thunk_asm.h>
 #else
 asm ( "\t.equ CONFIG_INDIRECT_THUNK, "
--
generated by git-patchbot for /home/xen/git/xen.git#master


_______________________________________________
Xen-changelog mailing list
[hidden email]
https://lists.xenproject.org/xen-changelog