Module Name: src
Committed By: uebayasi
Date: Sat Nov 13 13:13:34 UTC 2010
Modified Files:
src/sys/arch/arm/include: cpu.h
src/sys/arch/powerpc/include: cpu.h
Log Message:
Include sys/device_if.h instead of sys/device.h. machine/cpu.h is
one of the lower-most definitions. Relying on the huge sys/device.h
is not a good idea.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/arm/include/cpu.h
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/powerpc/include/cpu.h
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/include/cpu.h
diff -u src/sys/arch/arm/include/cpu.h:1.61 src/sys/arch/arm/include/cpu.h:1.62
--- src/sys/arch/arm/include/cpu.h:1.61 Sat Nov 13 12:44:28 2010
+++ src/sys/arch/arm/include/cpu.h Sat Nov 13 13:13:33 2010
@@ -229,6 +229,7 @@
static inline void cpu_dosoftints(void);
#endif
+#include <sys/device_if.h>
#include <sys/evcnt.h>
#include <sys/cpu_data.h>
struct cpu_info {
Index: src/sys/arch/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.71 src/sys/arch/powerpc/include/cpu.h:1.72
--- src/sys/arch/powerpc/include/cpu.h:1.71 Wed Oct 20 18:52:33 2010
+++ src/sys/arch/powerpc/include/cpu.h Sat Nov 13 13:13:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.71 2010/10/20 18:52:33 phx Exp $ */
+/* $NetBSD: cpu.h,v 1.72 2010/11/13 13:13:34 uebayasi Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -52,7 +52,8 @@
#include <machine/frame.h>
#include <machine/psl.h>
#include <machine/intr.h>
-#include <sys/device.h>
+#include <sys/device_if.h>
+#include <sys/evcnt.h>
#include <sys/cpu_data.h>
