Module Name: src
Committed By: dyoung
Date: Fri Jul 1 19:24:14 UTC 2011
Modified Files:
src/sys/arch/amd64/amd64: fpu.c genassym.cf rbus_machdep.c
Log Message:
#include <sys/bus.h> instead of <machine/bus.h>.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/amd64/amd64/fpu.c
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/amd64/amd64/genassym.cf
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/amd64/amd64/rbus_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/amd64/amd64/fpu.c
diff -u src/sys/arch/amd64/amd64/fpu.c:1.34 src/sys/arch/amd64/amd64/fpu.c:1.35
--- src/sys/arch/amd64/amd64/fpu.c:1.34 Mon Mar 7 02:24:57 2011
+++ src/sys/arch/amd64/amd64/fpu.c Fri Jul 1 19:24:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.34 2011/03/07 02:24:57 cherry Exp $ */
+/* $NetBSD: fpu.c,v 1.35 2011/07/01 19:24:14 dyoung Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc. All
@@ -100,7 +100,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.34 2011/03/07 02:24:57 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.35 2011/07/01 19:24:14 dyoung Exp $");
#include "opt_multiprocessor.h"
@@ -114,7 +114,7 @@
#include <sys/vmmeter.h>
#include <sys/kernel.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <machine/cpu.h>
#include <machine/intr.h>
#include <machine/cpufunc.h>
Index: src/sys/arch/amd64/amd64/genassym.cf
diff -u src/sys/arch/amd64/amd64/genassym.cf:1.47 src/sys/arch/amd64/amd64/genassym.cf:1.48
--- src/sys/arch/amd64/amd64/genassym.cf:1.47 Sun Jun 12 03:35:37 2011
+++ src/sys/arch/amd64/amd64/genassym.cf Fri Jul 1 19:24:14 2011
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.47 2011/06/12 03:35:37 rmind Exp $
+# $NetBSD: genassym.cf,v 1.48 2011/07/01 19:24:14 dyoung Exp $
#
# Copyright (c) 1998, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -122,7 +122,7 @@
include <xen/xen3-public/xen.h>
endif
-include <x86/bus.h>
+include <sys/bus.h>
define LSRUN LSRUN
define LSONPROC LSONPROC
Index: src/sys/arch/amd64/amd64/rbus_machdep.c
diff -u src/sys/arch/amd64/amd64/rbus_machdep.c:1.4 src/sys/arch/amd64/amd64/rbus_machdep.c:1.5
--- src/sys/arch/amd64/amd64/rbus_machdep.c:1.4 Mon Dec 20 00:25:24 2010
+++ src/sys/arch/amd64/amd64/rbus_machdep.c Fri Jul 1 19:24:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rbus_machdep.c,v 1.4 2010/12/20 00:25:24 matt Exp $ */
+/* $NetBSD: rbus_machdep.c,v 1.5 2011/07/01 19:24:14 dyoung Exp $ */
/*
* Copyright (c) 1999
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.4 2010/12/20 00:25:24 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rbus_machdep.c,v 1.5 2011/07/01 19:24:14 dyoung Exp $");
#include "opt_pcifixup.h"
@@ -36,7 +36,7 @@
#include <sys/sysctl.h>
-#include <machine/bus.h>
+#include <sys/bus.h>
#include <dev/cardbus/rbus.h>
#include <sys/device.h>
