Module Name: src
Committed By: jmcneill
Date: Sun Jun 26 11:14:36 UTC 2022
Modified Files:
src/sys/arch/aarch64/aarch64: vectors.S
src/sys/arch/arm/cortex: gic.c gicv3.c
Log Message:
build fix: remove includes of opt_gic.h
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/aarch64/aarch64/vectors.S
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/arm/cortex/gic.c
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/arm/cortex/gicv3.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/aarch64/aarch64/vectors.S
diff -u src/sys/arch/aarch64/aarch64/vectors.S:1.28 src/sys/arch/aarch64/aarch64/vectors.S:1.29
--- src/sys/arch/aarch64/aarch64/vectors.S:1.28 Sat Jun 25 13:24:34 2022
+++ src/sys/arch/aarch64/aarch64/vectors.S Sun Jun 26 11:14:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: vectors.S,v 1.28 2022/06/25 13:24:34 jmcneill Exp $ */
+/* $NetBSD: vectors.S,v 1.29 2022/06/26 11:14:36 jmcneill Exp $ */
#include <aarch64/asm.h>
#include <aarch64/locore.h>
@@ -9,9 +9,8 @@
#include "opt_cpuoptions.h"
#include "opt_ddb.h"
#include "opt_dtrace.h"
-#include "opt_gic.h"
-RCSID("$NetBSD: vectors.S,v 1.28 2022/06/25 13:24:34 jmcneill Exp $")
+RCSID("$NetBSD: vectors.S,v 1.29 2022/06/26 11:14:36 jmcneill Exp $")
ARMV8_DEFINE_OPTIONS
Index: src/sys/arch/arm/cortex/gic.c
diff -u src/sys/arch/arm/cortex/gic.c:1.55 src/sys/arch/arm/cortex/gic.c:1.56
--- src/sys/arch/arm/cortex/gic.c:1.55 Sat Jun 25 13:24:34 2022
+++ src/sys/arch/arm/cortex/gic.c Sun Jun 26 11:14:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gic.c,v 1.55 2022/06/25 13:24:34 jmcneill Exp $ */
+/* $NetBSD: gic.c,v 1.56 2022/06/26 11:14:36 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -30,12 +30,11 @@
#include "opt_ddb.h"
#include "opt_multiprocessor.h"
-#include "opt_gic.h"
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.55 2022/06/25 13:24:34 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic.c,v 1.56 2022/06/26 11:14:36 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
Index: src/sys/arch/arm/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.53 src/sys/arch/arm/cortex/gicv3.c:1.54
--- src/sys/arch/arm/cortex/gicv3.c:1.53 Sat Jun 25 18:05:09 2022
+++ src/sys/arch/arm/cortex/gicv3.c Sun Jun 26 11:14:36 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.53 2022/06/25 18:05:09 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.54 2022/06/26 11:14:36 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca>
@@ -27,12 +27,11 @@
*/
#include "opt_multiprocessor.h"
-#include "opt_gic.h"
#define _INTR_PRIVATE
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.53 2022/06/25 18:05:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.54 2022/06/26 11:14:36 jmcneill Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
