Don't include "opt_kasan.h" when there's already <sys/asan.h> included.

This commit is contained in:
maxv 2019-11-14 16:48:51 +00:00
parent 7483976de6
commit 8965522558
4 changed files with 8 additions and 12 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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

View File

@ -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