From 1abcd7b695bbf4adf355638b7ca34b259714eaff Mon Sep 17 00:00:00 2001 From: jkim Date: Tue, 13 Jul 2010 16:57:52 +0000 Subject: [PATCH] Define SMP unconditionally for amd64 and remove opt_global.h from SRCS. Note it is done just for correctness sake because we do not build, ship, or support acpi.ko on amd64. Prodded by: bde --- sys/modules/acpi/acpi/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/modules/acpi/acpi/Makefile b/sys/modules/acpi/acpi/Makefile index 4b3d4735bc5c..80ea7da83ab9 100644 --- a/sys/modules/acpi/acpi/Makefile +++ b/sys/modules/acpi/acpi/Makefile @@ -99,7 +99,10 @@ SRCS+= assym.s madt.c CLEANFILES+= acpi_wakecode.bin acpi_wakecode.h acpi_wakecode.o .if ${MACHINE_ARCH} == "amd64" -SRCS+= acpi_switch.S acpi_wakedata.h opt_global.h +.if !defined(KERNBUILDDIR) +CFLAGS+=-DSMP +.endif +SRCS+= acpi_switch.S acpi_wakedata.h CLEANFILES+= acpi_wakedata.h ASM_CFLAGS= -x assembler-with-cpp -DLOCORE ${CFLAGS} acpi_switch.o: acpi_switch.S