From patchwork Tue May 21 14:29:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 164731 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1677515ili; Tue, 21 May 2019 07:31:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqwfRd5OV0iA6fMSQ6X4jKvL4IIUdYsOt/MN/BB6bU+KbMIWBQXplaK/wDwmCVmbgGjXY9qH X-Received: by 2002:a02:879a:: with SMTP id t26mr14677716jai.89.1558449061994; Tue, 21 May 2019 07:31:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558449061; cv=none; d=google.com; s=arc-20160816; b=1F4jr2XxHuvWtL6YJLlP4xF7XyMGk9WL7/d3SU75khd376vdZOIkCKGxNH7MPj2i8h uRDXzJCbKijfLcTqYm+Cwy+xeCLoSqRpl7lIsnVRqAjatkXH9u0C5gjGY311QQ2BkOqt FfWxo+sJ3jAlpotf5v/yWSvJ1BAs6w7FofTnmVjZ4lj69cXyTRUn7SoGpbwXMfL/fvPC uRmMLbOT5ibMcR3zCke4n3jYIIoCyi7oVjW+k5ozDViWsqZr6Le9Hcll+RrnnmUYaBYT cPK//JkIdeLs8Jdjf7/85NnOPVQf+z9FfASS8mJ0P3IJeKEkzOBLr5oaYyOFMvxmCjZy IvTA== 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:message-id:date:to:from; bh=6+Egidmmbu1+V8yLiDnBLMgIzSGblUABeOgIEWC8RIY=; b=CV+4qI7D0gGSfPxSwB8COWI15hc0z3eeywhnnMjl43GK8sFxPnzx932SSa6ljoQApA +qxXfEV3c9YYrSBp43eTXupvOhtlEjz+yrGw0THUc3FoLv6kBvGTgccBLqZG734PGWmv p9YmUFMpmX1zc/lRNeX2bfeznBhOz9YHOd2+vQd40+6P8suTeu8AljI1SSdAaajpRi7Z RxOizR736xdi92M72L4crH3a11tcUE7176nygAdUCQvOIFfzfiicAWF8pL2uyRXP7HpE 0pBsFhR6EAqw4wzaK2yDcl0FFsqakskkeD6Ty495OWCr6Wr8EQSEBRcWdljuHTmzc4cB llKg== 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 d139si1906081itd.4.2019.05.21.07.31.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 May 2019 07:31:01 -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 1hT5lc-0008Vh-78; Tue, 21 May 2019 14:29:24 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hT5la-0008Vc-Ba for xen-devel@lists.xenproject.org; Tue, 21 May 2019 14:29:22 +0000 X-Inumbo-ID: d21a6224-7bd4-11e9-8980-bc764e045a96 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTP id d21a6224-7bd4-11e9-8980-bc764e045a96; Tue, 21 May 2019 14:29:20 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CAA73374; Tue, 21 May 2019 07:29:19 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id DD6213F5AF; Tue, 21 May 2019 07:29:18 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 21 May 2019 15:29:13 +0100 Message-Id: <20190521142913.22394-1-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 Subject: [Xen-devel] [PATCH] xen/arm64: livepatch: Fix build after 03957f58db 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: Andrew Cooper , Julien Grall , sstabellini@kernel.org MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" Commit 03957f58db "xen/const: Extend the existing macro BIT to take a suffix in parameter" didn't convert all the callers of the macro BIT. This will result to a build breakage when enabling Livepatch on arm64. Reported-by: Andrew Cooper Signed-off-by: Julien Grall Acked-by: Andrew Cooper Acked-by: Stefano Stabellini --- xen/arch/arm/arm64/livepatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/arm64/livepatch.c b/xen/arch/arm/arm64/livepatch.c index 2247b925a0..5c75779284 100644 --- a/xen/arch/arm/arm64/livepatch.c +++ b/xen/arch/arm/arm64/livepatch.c @@ -208,7 +208,7 @@ static int reloc_insn_imm(enum aarch64_reloc_op op, void *dest, u64 val, sval >>= lsb; /* Extract the value bits and shift them to bit 0. */ - imm_mask = (BIT(lsb + len) - 1) >> lsb; + imm_mask = (BIT(lsb + len, UL) - 1) >> lsb; imm = sval & imm_mask; /* Update the instruction's immediate field. */