Module Name: src
Committed By: ryo
Date: Thu May 23 15:54:28 UTC 2019
Modified Files:
src/sys/arch/arm/acpi: acpi_platform.c cpu_acpi.c
Log Message:
fix build without options MULTIPROCESSOR
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/acpi/acpi_platform.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/acpi/cpu_acpi.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/acpi/acpi_platform.c
diff -u src/sys/arch/arm/acpi/acpi_platform.c:1.11 src/sys/arch/arm/acpi/acpi_platform.c:1.12
--- src/sys/arch/arm/acpi/acpi_platform.c:1.11 Fri Dec 21 14:50:18 2018
+++ src/sys/arch/arm/acpi/acpi_platform.c Thu May 23 15:54:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_platform.c,v 1.11 2018/12/21 14:50:18 jmcneill Exp $ */
+/* $NetBSD: acpi_platform.c,v 1.12 2019/05/23 15:54:28 ryo Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,9 +32,10 @@
#include "com.h"
#include "plcom.h"
#include "opt_efi.h"
+#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.11 2018/12/21 14:50:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_platform.c,v 1.12 2019/05/23 15:54:28 ryo Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -113,7 +114,9 @@ acpi_platform_startup(void)
{
ACPI_TABLE_SPCR *spcr;
ACPI_TABLE_FADT *fadt;
+#ifdef MULTIPROCESSOR
ACPI_TABLE_MADT *madt;
+#endif
int baud_rate;
/*
@@ -198,6 +201,7 @@ acpi_platform_startup(void)
acpi_table_unmap((ACPI_TABLE_HEADER *)fadt);
}
+#ifdef MULTIPROCESSOR
/*
* Count CPUs
*/
@@ -212,6 +216,7 @@ acpi_platform_startup(void)
}
acpi_table_unmap((ACPI_TABLE_HEADER *)madt);
}
+#endif /* MULTIPROCESSOR */
}
static void
Index: src/sys/arch/arm/acpi/cpu_acpi.c
diff -u src/sys/arch/arm/acpi/cpu_acpi.c:1.5 src/sys/arch/arm/acpi/cpu_acpi.c:1.6
--- src/sys/arch/arm/acpi/cpu_acpi.c:1.5 Wed Dec 5 22:42:55 2018
+++ src/sys/arch/arm/acpi/cpu_acpi.c Thu May 23 15:54:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_acpi.c,v 1.5 2018/12/05 22:42:55 jmcneill Exp $ */
+/* $NetBSD: cpu_acpi.c,v 1.6 2019/05/23 15:54:28 ryo Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -30,9 +30,10 @@
*/
#include "tprof.h"
+#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_acpi.c,v 1.5 2018/12/05 22:42:55 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_acpi.c,v 1.6 2019/05/23 15:54:28 ryo Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -66,12 +67,14 @@ static void cpu_acpi_tprof_init(device_t
CFATTACH_DECL_NEW(cpu_acpi, 0, cpu_acpi_match, cpu_acpi_attach, NULL, NULL);
+#ifdef MULTIPROCESSOR
static register_t
cpu_acpi_mpstart_pa(void)
{
return (register_t)KERN_VTOPHYS((vaddr_t)cpu_mpstart);
}
+#endif /* MULTIPROCESSOR */
static int
cpu_acpi_match(device_t parent, cfdata_t cf, void *aux)
@@ -94,10 +97,11 @@ cpu_acpi_attach(device_t parent, device_
const uint64_t mpidr = gicc->ArmMpidr;
const int unit = device_unit(self);
struct cpu_info *ci = &cpu_info_store[unit];
- int error;
+#ifdef MULTIPROCESSOR
if (cpu_mpidr_aff_read() != mpidr) {
const u_int cpuindex = device_unit(self);
+ int error;
cpu_mpidr[cpuindex] = mpidr;
cpu_dcache_wb_range((vaddr_t)&cpu_mpidr[cpuindex], sizeof(cpu_mpidr[cpuindex]));
@@ -117,6 +121,7 @@ cpu_acpi_attach(device_t parent, device_
break;
}
}
+#endif /* MULTIPROCESSOR */
/* Store the ACPI Processor UID in cpu_info */
ci->ci_acpiid = gicc->Uid;
