Module Name: src Committed By: maxv Date: Thu Nov 14 16:48:51 UTC 2019
Modified Files: src/sys/arch/aarch64/aarch64: aarch64_machdep.c pmap.c src/sys/arch/amd64/amd64: machdep.c src/sys/uvm: uvm_glue.c Log Message: Don't include "opt_kasan.h" when there's already <sys/asan.h> included. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/arch/aarch64/aarch64/aarch64_machdep.c cvs rdiff -u -r1.48 -r1.49 src/sys/arch/aarch64/aarch64/pmap.c cvs rdiff -u -r1.339 -r1.340 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.168 -r1.169 src/sys/uvm/uvm_glue.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/aarch64_machdep.c diff -u src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.32 src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.33 --- src/sys/arch/aarch64/aarch64/aarch64_machdep.c:1.32 Sat Sep 28 07:06:32 2019 +++ src/sys/arch/aarch64/aarch64/aarch64_machdep.c Thu Nov 14 16:48:51 2019 @@ -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" Index: src/sys/arch/aarch64/aarch64/pmap.c diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.48 src/sys/arch/aarch64/aarch64/pmap.c:1.49 --- src/sys/arch/aarch64/aarch64/pmap.c:1.48 Tue Oct 29 20:01:22 2019 +++ src/sys/arch/aarch64/aarch64/pmap.c Thu Nov 14 16:48:51 2019 @@ -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 <r...@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" Index: src/sys/arch/amd64/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.339 src/sys/arch/amd64/amd64/machdep.c:1.340 --- src/sys/arch/amd64/amd64/machdep.c:1.339 Thu Nov 14 16:23:52 2019 +++ src/sys/arch/amd64/amd64/machdep.c Thu Nov 14 16:48:51 2019 @@ -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 #include "opt_xen.h" #include "opt_svs.h" #include "opt_kaslr.h" -#include "opt_kasan.h" #ifndef XENPV #include "opt_physmem.h" #endif Index: src/sys/uvm/uvm_glue.c diff -u src/sys/uvm/uvm_glue.c:1.168 src/sys/uvm/uvm_glue.c:1.169 --- src/sys/uvm/uvm_glue.c:1.168 Wed May 8 16:00:01 2019 +++ src/sys/uvm/uvm_glue.c Thu Nov 14 16:48:51 2019 @@ -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