Module Name: src
Committed By: hannken
Date: Mon Aug 22 13:57:24 UTC 2022
Modified Files:
src/sys/arch/amd64/include: asan.h
src/sys/arch/x86/x86: kgdb_machdep.c
Log Message:
Sprinkle "#include <machine/pmap_private.h>", kernel ALL/amd64
compiles again.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/amd64/include/asan.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/x86/x86/kgdb_machdep.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/amd64/include/asan.h
diff -u src/sys/arch/amd64/include/asan.h:1.10 src/sys/arch/amd64/include/asan.h:1.11
--- src/sys/arch/amd64/include/asan.h:1.10 Sat Aug 20 23:15:36 2022
+++ src/sys/arch/amd64/include/asan.h Mon Aug 22 13:57:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: asan.h,v 1.10 2022/08/20 23:15:36 riastradh Exp $ */
+/* $NetBSD: asan.h,v 1.11 2022/08/22 13:57:24 hannken Exp $ */
/*
* Copyright (c) 2018-2020 Maxime Villard, m00nbsd.net
@@ -37,6 +37,8 @@
#include <x86/bootspace.h>
+#include <machine/pmap_private.h>
+
#ifdef __HAVE_PCPU_AREA
#error "PCPU area not allowed with KASAN"
#endif
Index: src/sys/arch/x86/x86/kgdb_machdep.c
diff -u src/sys/arch/x86/x86/kgdb_machdep.c:1.5 src/sys/arch/x86/x86/kgdb_machdep.c:1.6
--- src/sys/arch/x86/x86/kgdb_machdep.c:1.5 Sun Apr 21 06:37:21 2019
+++ src/sys/arch/x86/x86/kgdb_machdep.c Mon Aug 22 13:57:24 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: kgdb_machdep.c,v 1.5 2019/04/21 06:37:21 maxv Exp $ */
+/* $NetBSD: kgdb_machdep.c,v 1.6 2022/08/22 13:57:24 hannken Exp $ */
/*
* Copyright (c) 1997, 2017 The NetBSD Foundation, Inc.
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.5 2019/04/21 06:37:21 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.6 2022/08/22 13:57:24 hannken Exp $");
#include "opt_ddb.h"
@@ -70,6 +70,7 @@ __KERNEL_RCSID(0, "$NetBSD: kgdb_machdep
#include <sys/kgdb.h>
#include <sys/systm.h>
+#include <machine/pmap_private.h>
#include <machine/pte.h>
#include <machine/trap.h>
