All of lore.kernel.org
 help / color / mirror / Atom feed
From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xenproject.org
Cc: Andrew Cooper <andrew.cooper3@citrix.com>,
	Jan Beulich <jbeulich@suse.com>,
	Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH 2/2] x86: fix indirect thunk usage of CONFIG_INDIRECT_THUNK
Date: Wed, 24 Jan 2018 15:48:49 +0000	[thread overview]
Message-ID: <20180124154849.84889-3-roger.pau@citrix.com> (raw)
In-Reply-To: <20180124154849.84889-1-roger.pau@citrix.com>

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
        ^

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
---
 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 627a544326..f7e53627ff 100644
--- a/xen/include/asm-x86/asm_defns.h
+++ b/xen/include/asm-x86/asm_defns.h
@@ -14,6 +14,9 @@
 #include <asm/alternative.h>
 
 #ifdef __ASSEMBLY__
+# ifndef CONFIG_INDIRECT_THUNK
+#  define CONFIG_INDIRECT_THUNK 0
+# endif
 # include <asm/indirect_thunk_asm.h>
 #else
 #define INCLUDE_INDIRECT_THUNK                                  \
-- 
2.15.1


_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel

  parent reply	other threads:[~2018-01-24 15:53 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-24 15:48 [PATCH 0/2] clang: fixes for the indirect thunk Roger Pau Monne
2018-01-24 15:48 ` [PATCH 1/2] x86/clang: fix build with indirect thunks Roger Pau Monne
2018-01-24 16:40   ` Jan Beulich
2018-01-24 17:06     ` Roger Pau Monné
2018-01-25  9:39       ` Jan Beulich
2018-01-25  9:50         ` Roger Pau Monné
2018-01-24 15:48 ` Roger Pau Monne [this message]
2018-01-24 16:23   ` [PATCH 2/2] x86: fix indirect thunk usage of CONFIG_INDIRECT_THUNK Jan Beulich
2018-01-24 16:52     ` Roger Pau Monné
2018-01-25 10:13       ` Jan Beulich
2018-01-25 10:15       ` Roger Pau Monné

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180124154849.84889-3-roger.pau@citrix.com \
    --to=roger.pau@citrix.com \
    --cc=andrew.cooper3@citrix.com \
    --cc=jbeulich@suse.com \
    --cc=xen-devel@lists.xenproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.