Module Name: src
Committed By: matt
Date: Tue Jun 9 22:47:59 UTC 2015
Modified Files:
src/sys/arch/cobalt/dev: com_mainbus.c zs.c
src/sys/arch/cobalt/pci: pci_machdep.c
Log Message:
#include <sys/cpu.h> or <mips/cpuregs.h> as needed
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/cobalt/dev/com_mainbus.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/cobalt/dev/zs.c
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/cobalt/pci/pci_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/cobalt/dev/com_mainbus.c
diff -u src/sys/arch/cobalt/dev/com_mainbus.c:1.19 src/sys/arch/cobalt/dev/com_mainbus.c:1.20
--- src/sys/arch/cobalt/dev/com_mainbus.c:1.19 Sat Jul 9 16:09:01 2011
+++ src/sys/arch/cobalt/dev/com_mainbus.c Tue Jun 9 22:47:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: com_mainbus.c,v 1.19 2011/07/09 16:09:01 matt Exp $ */
+/* $NetBSD: com_mainbus.c,v 1.20 2015/06/09 22:47:59 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,10 +26,11 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.19 2011/07/09 16:09:01 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: com_mainbus.c,v 1.20 2015/06/09 22:47:59 matt Exp $");
#include <sys/param.h>
#include <sys/bus.h>
+#include <sys/cpu.h>
#include <sys/device.h>
#include <sys/intr.h>
#include <sys/systm.h>
Index: src/sys/arch/cobalt/dev/zs.c
diff -u src/sys/arch/cobalt/dev/zs.c:1.3 src/sys/arch/cobalt/dev/zs.c:1.4
--- src/sys/arch/cobalt/dev/zs.c:1.3 Mon Apr 28 20:23:16 2008
+++ src/sys/arch/cobalt/dev/zs.c Tue Jun 9 22:47:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: zs.c,v 1.3 2008/04/28 20:23:16 martin Exp $ */
+/* $NetBSD: zs.c,v 1.4 2015/06/09 22:47:59 matt Exp $ */
/*-
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -37,20 +37,23 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.3 2008/04/28 20:23:16 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zs.c,v 1.4 2015/06/09 22:47:59 matt Exp $");
#include "opt_ddb.h"
#include <sys/param.h>
-#include <sys/systm.h>
#include <sys/conf.h>
+#include <sys/cpu.h>
#include <sys/device.h>
-#include <sys/tty.h>
#include <sys/intr.h>
+#include <sys/tty.h>
+#include <sys/systm.h>
#include <dev/cons.h>
#include <dev/ic/z8530reg.h>
+#include <mips/cpuregs.h>
+
#include <machine/autoconf.h>
#include <machine/z8530var.h>
Index: src/sys/arch/cobalt/pci/pci_machdep.c
diff -u src/sys/arch/cobalt/pci/pci_machdep.c:1.36 src/sys/arch/cobalt/pci/pci_machdep.c:1.37
--- src/sys/arch/cobalt/pci/pci_machdep.c:1.36 Tue Jul 29 21:21:44 2014
+++ src/sys/arch/cobalt/pci/pci_machdep.c Tue Jun 9 22:47:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.36 2014/07/29 21:21:44 skrll Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.37 2015/06/09 22:47:59 matt Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang. All rights reserved.
@@ -26,14 +26,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.36 2014/07/29 21:21:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.37 2015/06/09 22:47:59 matt Exp $");
#define _MIPS_BUS_DMA_PRIVATE
#include <sys/param.h>
#include <sys/bus.h>
-#include <sys/errno.h>
+#include <sys/cpu.h>
#include <sys/device.h>
+#include <sys/errno.h>
#include <sys/extent.h>
#include <sys/intr.h>
#include <sys/systm.h>
