From patchwork Thu Oct 31 15:09:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 178189 Delivered-To: patch@linaro.org Received: by 2002:a92:409a:0:0:0:0:0 with SMTP id d26csp2980124ill; Thu, 31 Oct 2019 08:11:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqwh4uJglYO9FBTToZCCkjS/V6jFpJk4AwUsrt9Ykna3XpVgdj8KIxZR3hiP/2eG39q2lmSd X-Received: by 2002:a02:9521:: with SMTP id y30mr3811313jah.107.1572534675871; Thu, 31 Oct 2019 08:11:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1572534675; cv=none; d=google.com; s=arc-20160816; b=ue80NTJ8aIaIC3ZDtSIFex9kN+gadxVOL60yulxSC0P7qN8949R9yErsVkIlX4JIyd HprSht5hbq/VvZRHGy4fCQSVQfuK+TeXDZbuUCe3Et/lEvCXaZRovhoSOx/8vrWPMKxA UD/3MKll5eNzcxX3GSOgdRZuQqLBqyXuE3TKuGMx3uZVU+rg65xNN6EpCaWCTV4xTm+w NsDNmGsiv/dW7YXnxZTALXoLAzcPfF5+1mC2JrDt6hcP0F/AHkUCg2yL3DUenl0wDEm7 q6bG5ne+hUMIb2cVbuxDz+jMVASMkvN65YHU12KoB+5IbgaCWKhMxtsBZ2gpNtoJEivb XDTg== 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=Jf3Ezr1okHhFMtckpYGBqSJNa2EXSFC/cvYeTala+bg=; b=uz7Cba6NnxpN5S0Snw3x3+G+rT7Cc1AhHfXWGGFupnm7B0GHsIc6/FnNspAuwCs5Tq //RoRAMT7oj3scNoKo2t+6UUHusppVOvIHayhbdInSn9U46gJKuo/es9wnqtP7v/hpP6 r8FMkuZLHyrW3+T515H+FH0oLm3Mk4xlc/zo09/BY8PPlTdaSXgh5pkRcc901WZbFti4 oVGL7sp6nJ0wUYmadkH/BqtJzo9GSqFDDrWcrsfi4jMba3fUKtJB4Wn6Ura4ppI2B1xT bj4Bq6PBThUImFNFRQolTmof3a6MS26C8wRmP03w+kBn706YrK2ri++GjKXySKt+s27k KUcg== 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 d78si7938467ild.23.2019.10.31.08.11.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 31 Oct 2019 08:11:15 -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 1iQC5Y-0007Y2-K2; Thu, 31 Oct 2019 15:10:16 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iQC5X-0007Wu-Am for xen-devel@lists.xenproject.org; Thu, 31 Oct 2019 15:10:15 +0000 X-Inumbo-ID: 7b1b11f0-fbf0-11e9-954c-12813bfff9fa Received: from foss.arm.com (unknown [217.140.110.172]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 7b1b11f0-fbf0-11e9-954c-12813bfff9fa; Thu, 31 Oct 2019 15:09:49 +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 2F9D468D; Thu, 31 Oct 2019 08:09:49 -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 2A8BE3F71E; Thu, 31 Oct 2019 08:09:48 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Thu, 31 Oct 2019 15:09:16 +0000 Message-Id: <20191031150922.22938-14-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 13/19] xen/arm: alternative: Remove unused parameter for alternative_if_not_cap 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, Stefano Stabellini , Julien Grall , Volodymyr Babchuk , Julien Grall , Volodymyr Babchuk MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The macro alternative_if_not_cap is taking two parameters. The second parameter is never used and it is hard to see how this can be used correctly as it is only protecting the alternative section magic. Signed-off-by: Julien Grall Reviewed-by: Volodymyr Babchuk Acked-by: Stefano Stabellini --- Changes in v2: - Add Volodymyr's reviewed-by - Add Stefano's acked-by --- xen/include/asm-arm/alternative.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/xen/include/asm-arm/alternative.h b/xen/include/asm-arm/alternative.h index dedb6dd001..2830a6da2d 100644 --- a/xen/include/asm-arm/alternative.h +++ b/xen/include/asm-arm/alternative.h @@ -116,13 +116,11 @@ int apply_alternatives(const struct alt_instr *start, const struct alt_instr *en * The code that follows this macro will be assembled and linked as * normal. There are no restrictions on this code. */ -.macro alternative_if_not cap, enable = 1 - .if \enable +.macro alternative_if_not cap .pushsection .altinstructions, "a" altinstruction_entry 661f, 663f, \cap, 662f-661f, 664f-663f .popsection 661: - .endif .endm /*