From 8965522558fd6b13703a370b317d623f05a5e6b6 Mon Sep 17 00:00:00 2001
From: maxv <maxv@NetBSD.org>
Date: Thu, 14 Nov 2019 16:48:51 +0000
Subject: [PATCH] Don't include "opt_kasan.h" when there's already <sys/asan.h>
 included.

---
 sys/arch/aarch64/aarch64/aarch64_machdep.c | 5 ++---
 sys/arch/aarch64/aarch64/pmap.c            | 5 ++---
 sys/arch/amd64/amd64/machdep.c             | 5 ++---
 sys/uvm/uvm_glue.c                         | 5 ++---
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/sys/arch/aarch64/aarch64/aarch64_machdep.c b/sys/arch/aarch64/aarch64/aarch64_machdep.c
index cd8135fdd8e3..2aa7e5141ba8 100644
--- a/sys/arch/aarch64/aarch64/aarch64_machdep.c
+++ b/sys/arch/aarch64/aarch64/aarch64_machdep.c
@@ -1,4 +1,4 @@
-/* $NetBSD: aarch64_machdep.c,v 1.32 2019/09/28 07:06:32 skrll Exp $ */
+/* $NetBSD: aarch64_machdep.c,v 1.33 2019/11/14 16:48:51 maxv Exp $ */
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,11 +30,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.32 2019/09/28 07:06:32 skrll Exp $");
+__KERNEL_RCSID(1, "$NetBSD: aarch64_machdep.c,v 1.33 2019/11/14 16:48:51 maxv Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
-#include "opt_kasan.h"
 #include "opt_kernhist.h"
 #include "opt_modular.h"
 #include "opt_fdt.h"
diff --git a/sys/arch/aarch64/aarch64/pmap.c b/sys/arch/aarch64/aarch64/pmap.c
index 73189f432990..e65be00bc8d2 100644
--- a/sys/arch/aarch64/aarch64/pmap.c
+++ b/sys/arch/aarch64/aarch64/pmap.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.48 2019/10/29 20:01:22 maya Exp $	*/
+/*	$NetBSD: pmap.c,v 1.49 2019/11/14 16:48:51 maxv Exp $	*/
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <ryo@nerv.org>
@@ -27,11 +27,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.48 2019/10/29 20:01:22 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.49 2019/11/14 16:48:51 maxv Exp $");
 
 #include "opt_arm_debug.h"
 #include "opt_ddb.h"
-#include "opt_kasan.h"
 #include "opt_multiprocessor.h"
 #include "opt_pmap.h"
 #include "opt_uvmhist.h"
diff --git a/sys/arch/amd64/amd64/machdep.c b/sys/arch/amd64/amd64/machdep.c
index ff73b3b7756b..8e06a67404aa 100644
--- a/sys/arch/amd64/amd64/machdep.c
+++ b/sys/arch/amd64/amd64/machdep.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.339 2019/11/14 16:23:52 maxv Exp $	*/
+/*	$NetBSD: machdep.c,v 1.340 2019/11/14 16:48:51 maxv Exp $	*/
 
 /*
  * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.339 2019/11/14 16:23:52 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.340 2019/11/14 16:48:51 maxv Exp $");
 
 #include "opt_modular.h"
 #include "opt_user_ldt.h"
@@ -122,7 +122,6 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.339 2019/11/14 16:23:52 maxv Exp $");
 #include "opt_xen.h"
 #include "opt_svs.h"
 #include "opt_kaslr.h"
-#include "opt_kasan.h"
 #ifndef XENPV
 #include "opt_physmem.h"
 #endif
diff --git a/sys/uvm/uvm_glue.c b/sys/uvm/uvm_glue.c
index e2747f4d5185..467da4a6d45d 100644
--- a/sys/uvm/uvm_glue.c
+++ b/sys/uvm/uvm_glue.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_glue.c,v 1.168 2019/05/08 16:00:01 chs Exp $	*/
+/*	$NetBSD: uvm_glue.c,v 1.169 2019/11/14 16:48:51 maxv Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -62,12 +62,11 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.168 2019/05/08 16:00:01 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_glue.c,v 1.169 2019/11/14 16:48:51 maxv Exp $");
 
 #include "opt_kgdb.h"
 #include "opt_kstack.h"
 #include "opt_uvmhist.h"
-#include "opt_kasan.h"
 
 /*
  * uvm_glue.c: glue functions