From patchwork Thu Oct 31 15:09:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 178195 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2980321ill; Thu, 31 Oct 2019 08:11:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqzlEBNbFOJpnlTj5WlP27p2bs83uWlMmFT505KYqf3/xtpTV0EYkVsoejB5tiKG4zqbbZZq X-Received: by 2002:a6b:d104:: with SMTP id l4mr5652034iob.50.1572534683905; Thu, 31 Oct 2019 08:11:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572534683; cv=none; d=google.com; s=arc-20160816; b=SZoGUQ8lvcv37XwFroI24hQkiArFLcH96Vyaz8QTDS4j8OMzjuqqruD7iJt0REhrft YUA7j3ylwUU5X7FaO6SvNvics+t1IfFDoeFgTTvQX1xl4btfXOQA0LbR7v/wB0tpDkXt 4LK8yW+gXBbDcCGEC2rx53bQ05KJXEtL91ImAJ9UD9Uqpy6HneV2+SLPuotUfssdvsOj 1c+TtKEa8tsw1S8MvRkBGsNNI8g6KTlgE9HrO03PKbuPJGwVNCS+UA4Xfk0mTtLYoYxN CR0iRGM5U14pCnU6fI3OhcffGDmskwFZRxOkDrfl+GNcFn2QSBcYqOcWQBsV/oRCVmgl CGjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=hxxajyU30rVPA4aBN2hqxvTU1b1t7CFTWTb4BlVB1yA=; b=i1xqke9Ilv9kQGsOqo0f0586v5KON74bK1LIXenG141W297PanTm1liFV36Y6t17dI 8EBY8cMA+OsS/7KXQQjiLEXjIW1hXlWD5FuXc47J/kBOcJpRnLqW8wMulhPIUFvpMTkM 5/9DfWi/w8A+YdBCL0rhnXCjjLZ3J4yUnEA1/QTYfVUaadJPqLEFL+0it9nVQ0iCkNwd RzTMRflBUIyFCkO1W6maDPe+nb/suLBHX9bUpUFruNHkH+whh727vYr0Hb23JZfLGTHK oT+DQVea4Bt5zOrKDVZ9xm0l+vNoJlcpaMbRetGg3ebMsAPQsWJ7x4pJ9z6gioLd3D3O IJLw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id l29si9200152jap.83.2019.10.31.08.11.23 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Oct 2019 08:11:23 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iQC5J-0006h5-5F; Thu, 31 Oct 2019 15:10:01 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iQC5H-0006fZ-CW for xen-devel@lists.xenproject.org; Thu, 31 Oct 2019 15:09:59 +0000 X-Inumbo-ID: 7cf7f202-fbf0-11e9-bbab-bc764e2007e4 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 7cf7f202-fbf0-11e9-bbab-bc764e2007e4; Thu, 31 Oct 2019 15:09:51 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B9C107B9; Thu, 31 Oct 2019 08:09:51 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (unknown [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D204D3F71E; Thu, 31 Oct 2019 08:09:50 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Thu, 31 Oct 2019 15:09:18 +0000 Message-Id: <20191031150922.22938-16-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191031150922.22938-1-julien.grall@arm.com> References: <20191031150922.22938-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH for-4.13 v4 15/19] xen/arm: Allow insn.h to be called from assembly X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: jgross@suse.com, Volodymyr Babchuk , Julien Grall , Stefano Stabellini , Julien Grall MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" A follow-up patch will require to include insn.h from assembly code. So we need to protect any C-specific definition to avoid compilation errors when used in assembly code. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- Changes in v3: - Add Stefano's reviewed-by Changes in v2: - Fix typo - Remove in-code comment --- xen/include/asm-arm/insn.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xen/include/asm-arm/insn.h b/xen/include/asm-arm/insn.h index 19277212e1..27271e95f9 100644 --- a/xen/include/asm-arm/insn.h +++ b/xen/include/asm-arm/insn.h @@ -1,6 +1,8 @@ #ifndef __ARCH_ARM_INSN #define __ARCH_ARM_INSN +#ifndef __ASSEMBLY__ + #include #if defined(CONFIG_ARM_64) @@ -11,6 +13,8 @@ # error "unknown ARM variant" #endif +#endif /* __ASSEMBLY__ */ + /* On ARM32,64 instructions are always 4 bytes long. */ #define ARCH_PATCH_INSN_SIZE 4