Module Name: src
Committed By: chs
Date: Sat Feb 22 19:49:11 UTC 2020
Modified Files:
src/sys/arch/arm/arm: fiq.c
src/sys/arch/x86/acpi: acpi_wakeup.c
src/sys/arch/x86/include: bus_private.h
src/sys/dev/audio: audio.c
Log Message:
remove some unnecessary includes of internal UVM headers.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/arm/fiq.c
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/x86/acpi/acpi_wakeup.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/x86/include/bus_private.h
cvs rdiff -u -r1.52 -r1.53 src/sys/dev/audio/audio.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/arm/arm/fiq.c
diff -u src/sys/arch/arm/arm/fiq.c:1.8 src/sys/arch/arm/arm/fiq.c:1.9
--- src/sys/arch/arm/arm/fiq.c:1.8 Wed Jan 24 09:04:44 2018
+++ src/sys/arch/arm/arm/fiq.c Sat Feb 22 19:49:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fiq.c,v 1.8 2018/01/24 09:04:44 skrll Exp $ */
+/* $NetBSD: fiq.c,v 1.9 2020/02/22 19:49:11 chs Exp $ */
/*
* Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fiq.c,v 1.8 2018/01/24 09:04:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fiq.c,v 1.9 2020/02/22 19:49:11 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -44,8 +44,6 @@ __KERNEL_RCSID(0, "$NetBSD: fiq.c,v 1.8
#include <arm/cpufunc.h>
#include <arm/fiq.h>
-#include <uvm/uvm.h>
-
TAILQ_HEAD(, fiqhandler) fiqhandler_stack =
TAILQ_HEAD_INITIALIZER(fiqhandler_stack);
Index: src/sys/arch/x86/acpi/acpi_wakeup.c
diff -u src/sys/arch/x86/acpi/acpi_wakeup.c:1.51 src/sys/arch/x86/acpi/acpi_wakeup.c:1.52
--- src/sys/arch/x86/acpi/acpi_wakeup.c:1.51 Sat Oct 12 06:31:03 2019
+++ src/sys/arch/x86/acpi/acpi_wakeup.c Sat Feb 22 19:49:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_wakeup.c,v 1.51 2019/10/12 06:31:03 maxv Exp $ */
+/* $NetBSD: acpi_wakeup.c,v 1.52 2020/02/22 19:49:11 chs Exp $ */
/*-
* Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.51 2019/10/12 06:31:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.52 2020/02/22 19:49:11 chs Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -70,7 +70,6 @@ __KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.
#include <sys/sysctl.h>
#include <uvm/uvm_extern.h>
-#include <uvm/uvm_page.h>
#ifdef __i386__
#include "opt_mtrr.h"
Index: src/sys/arch/x86/include/bus_private.h
diff -u src/sys/arch/x86/include/bus_private.h:1.14 src/sys/arch/x86/include/bus_private.h:1.15
--- src/sys/arch/x86/include/bus_private.h:1.14 Thu Sep 1 15:10:31 2011
+++ src/sys/arch/x86/include/bus_private.h Sat Feb 22 19:49:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_private.h,v 1.14 2011/09/01 15:10:31 christos Exp $ */
+/* $NetBSD: bus_private.h,v 1.15 2020/02/22 19:49:11 chs Exp $ */
/* NetBSD: bus.h,v 1.8 2005/03/09 19:04:46 matt Exp */
/*-
@@ -128,7 +128,7 @@ struct x86_bus_dma_cookie {
#endif /* _BUS_PMAP_ENTER */
#if !defined(_BUS_VIRT_TO_BUS)
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
static __inline bus_addr_t _bus_virt_to_bus(struct pmap *, vaddr_t);
#define _BUS_VIRT_TO_BUS(pm, va) _bus_virt_to_bus((pm), (va))
Index: src/sys/dev/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.52 src/sys/dev/audio/audio.c:1.53
--- src/sys/dev/audio/audio.c:1.52 Sat Feb 22 08:15:09 2020
+++ src/sys/dev/audio/audio.c Sat Feb 22 19:49:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.52 2020/02/22 08:15:09 isaki Exp $ */
+/* $NetBSD: audio.c,v 1.53 2020/02/22 19:49:11 chs Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -142,7 +142,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.52 2020/02/22 08:15:09 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.53 2020/02/22 19:49:11 chs Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -188,7 +188,7 @@ __KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.
#include <machine/endian.h>
-#include <uvm/uvm.h>
+#include <uvm/uvm_extern.h>
#include "ioconf.h"
