[Xen-devel,FIXUP] replace LOG_2 with ilog2

Message ID 20180305165634.4178-1-andre.przywara@linaro.org
State New
Headers show
  • [Xen-devel,FIXUP] replace LOG_2 with ilog2
Related show

Commit Message

Andre Przywara March 5, 2018, 4:56 p.m.
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 <andre.przywara@linaro.org>

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!


 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 <bits> 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