From patchwork Mon Mar 5 16:56:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Przywara X-Patchwork-Id: 130704 Delivered-To: patch@linaro.org Received: by 10.46.66.2 with SMTP id p2csp2907159lja; Mon, 5 Mar 2018 08:59:20 -0800 (PST) X-Google-Smtp-Source: AG47ELuBz+tcWR2LLAFwMkyNF4PkIV2Tbene2J8KR4Cpeb5Vbhrc9T+RuZV3+dNPfa2db5vadQ1Z X-Received: by 10.36.10.149 with SMTP id 143mr15189509itw.72.1520269160202; Mon, 05 Mar 2018 08:59:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1520269160; cv=none; d=google.com; s=arc-20160816; b=q/d0nu1OC9gAfBgZVnvI5yiWWcsuuG8WrcDHZFlrOAwdlSabRulCp1Fw8efQXU6weT Mzt8JP0j28yFE1TvOG5Y2jZs/yB0+gPhDWfvpLk1FycOSvKzu4LHENLOGGoxwS9DfP/b oriwSULKmmJYYbhh6W9p3DDGIJEl/tvDSyFpQWl8orFS3y7E76b+t9A1+vWk5goLvF93 G0IrdEzwvTwiufYogTD63OE8Z9CdmZi7DvvWTjEz/moWtBwE7jsKWk4WzEzC9rMHCNkj WIQnczuvt+2yqqeiqut2FBmM2f0tuW561gDjnc9RLR/Lg+rnAFc6Nk/hVEYUX9LaNGG9 QrbA== 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 :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:dkim-signature:arc-authentication-results; bh=1RMQBUhMIhSWItL8CFTUr45vG23ovihTt7oW3j29Z3s=; b=gq2afgGV9bHmm+N8sxIgy0Z9edo+8buDqSitRFIkNTArV5LZXclvkKEMgUqueBXHSz i+goU91O7EGf22m4F/wjJCZ9aNkicJhHWyVBsFta9DBN0sjISdJPkr8TpNElM7ZD/lba AXuYZqPgj/lXr9bF2WYdw7LYWhPPBQa1RnsShIz0UCml1SrMdH3ZF0XDBXn2eXwfsMoS viMM+ncQ4zIbmnLzpmj+w4HVeueEPiMc091AVo2g2U0A2Z3PjP5Or6g693uIg9ekA+GQ L36HuGyPrZ4c8qG6Ebdqs8woz3Wl2HXd1RcQWN8BtNTkjLfp/ojX4kidtwWKo0dH2+c5 c+Og== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ZgApSaMU; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id v3si6019916ita.130.2018.03.05.08.59.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Mar 2018 08:59:20 -0800 (PST) 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; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=ZgApSaMU; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1estPp-0002Tt-UI; Mon, 05 Mar 2018 16:56:45 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1estPo-0002Th-Nh for xen-devel@lists.xenproject.org; Mon, 05 Mar 2018 16:56:44 +0000 X-Inumbo-ID: 06ba0d04-2096-11e8-ba59-bc764e045a96 Received: from mail-wm0-x241.google.com (unknown [2a00:1450:400c:c09::241]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTPS id 06ba0d04-2096-11e8-ba59-bc764e045a96; Mon, 05 Mar 2018 17:55:37 +0100 (CET) Received: by mail-wm0-x241.google.com with SMTP id t74so17371330wme.3 for ; Mon, 05 Mar 2018 08:56:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=NFwQxcMRGx/i5fEF8cvWq2IIsZ0fBLLtkjsgfrrX7VM=; b=ZgApSaMUmClqIwKyDqDZ9/Lk6oDe/x6xBDELCNyXl11bTj5Qz2xPbrlCnf/Al8aBmB yFUQkqaB6eroZK8bn9V5Zmxr2SlxmwSijsL4m4mv0np5h84E3otFDgEub950zMJuHXAO HsmUuPhShnjT5SxnVgOHOKx4OC6xJmFwSDbvo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=NFwQxcMRGx/i5fEF8cvWq2IIsZ0fBLLtkjsgfrrX7VM=; b=fwlByATmiPUMWzBlFtEzbXhWYY/UrNNd7VMGdXr3/6ajXkiPpqW9kCNb2rlyuvhyr4 ssXUnq/W+TOmepzaoGjtZprWnUILuND3yIyx9Zy/brj5K2NMAFWYFrByQ4Aqp9QNeqpi vR+9Z2NSwbhunjvvcntwp/AWpPni0wMSL5NrR6K3JpLtM5yWmYHu1PeQzcncREnj6+yy Xw511NPs7AqHBoySJbL48tUPG3coJKDHiezXxpNPPuxzZn66GDXnIkZ6dtqxn0Je5H5J 0hIZbXt3KEt5oTMWxDJTNbEuSMLZvb4SPB0td6bX+wn05VXePqsGFULFOhttxdvrpXlO 4mOg== X-Gm-Message-State: AElRT7HnyO/A7LjQL5po/ti7zEvjs3HX3sF44sk00M7rhSeoJ2F5BV+D qClb/tmmwsxnbUC018fYNOzn4g== X-Received: by 10.28.29.209 with SMTP id d200mr9495523wmd.149.1520269001825; Mon, 05 Mar 2018 08:56:41 -0800 (PST) Received: from e104803-lin.lan (mail.andrep.de. [217.160.17.100]) by smtp.gmail.com with ESMTPSA id k2sm15744669wrc.30.2018.03.05.08.56.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 05 Mar 2018 08:56:41 -0800 (PST) From: Andre Przywara To: Julien Grall , Stefano Stabellini Date: Mon, 5 Mar 2018 16:56:34 +0000 Message-Id: <20180305165634.4178-1-andre.przywara@linaro.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180305160415.16760-35-andre.przywara@linaro.org> References: <20180305160415.16760-35-andre.przywara@linaro.org> Cc: xen-devel@lists.xenproject.org Subject: [Xen-devel] [FIXUP] replace LOG_2 with ilog2 X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The macro formerly named LOG_2 has been recently renamed to ilog2, so adjust the name in vgic-mmio.h. Signed-off-by: Andre Przywara --- Hi, I somehow rebased without actually trying to re-compile (since the rebase itself went through smoothly). So I missed this subtle renaming in the tree. Please apply this patch (or merge it into "[PATCH 34/57] ARM: new VGIC: Add MMIO handling framework") to get actually something that compiles. Apologies for that mishap! Cheers, Andre xen/arch/arm/vgic/vgic-mmio.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/arm/vgic/vgic-mmio.h b/xen/arch/arm/vgic/vgic-mmio.h index bbf0d181ae..5e6cff9eb2 100644 --- a/xen/arch/arm/vgic/vgic-mmio.h +++ b/xen/arch/arm/vgic/vgic-mmio.h @@ -49,7 +49,7 @@ extern struct mmio_handler_ops vgic_io_ops; * This assumes that is a power of two. */ #define VGIC_ADDR_TO_INTID(addr, bits) (((addr) & VGIC_ADDR_IRQ_MASK(bits)) * \ - 8 >> LOG_2(bits)) + 8 >> ilog2(bits)) /* * Some VGIC registers store per-IRQ information, with a different number