From f7dc972fde66d93143c3f6927087c13ae74a4828 Mon Sep 17 00:00:00 2001 From: Marc Jones Date: Sat, 31 Mar 2018 22:45:35 -0600 Subject: ioapic: extend definition name to avoid collision Change EN/DISABLED to INT_EN/DISABLED to avoid collision with other EN/DISABLE definition. Change-Id: I85b1c544d0f31340a09e18f4b36c1942ea0fa6ef Signed-off-by: Marc Jones Reviewed-on: https://review.coreboot.org/25540 Reviewed-by: Martin Roth Tested-by: build bot (Jenkins) --- src/drivers/generic/ioapic/ioapic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/generic/ioapic/ioapic.c b/src/drivers/generic/ioapic/ioapic.c index 44f1b02424..271e98c2e3 100644 --- a/src/drivers/generic/ioapic/ioapic.c +++ b/src/drivers/generic/ioapic/ioapic.c @@ -61,7 +61,7 @@ static void ioapic_init(struct device *dev) if (config->enable_virtual_wire) { /* Enable Virtual Wire Mode. */ - low = ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT; + low = INT_ENABLED | TRIGGER_EDGE | POLARITY_HIGH | PHYSICAL_DEST | ExtINT; high = bsp_lapicid << (56 - 32); io_apic_write(ioapic_base, 0x10, low); @@ -75,7 +75,7 @@ static void ioapic_init(struct device *dev) printk(BIOS_SPEW, "IOAPIC: reg 0x%08x value 0x%08x 0x%08x\n", 0, high, low); } - low = DISABLED; + low = INT_DISABLED; high = NONE; for (i = 1; i < ioapic_interrupts; i++) { -- cgit v1.2.3