Module Name: src
Committed By: matt
Date: Mon Jun 20 05:59:06 UTC 2011
Modified Files:
src/sys/arch/powerpc/powerpc: db_interface.c db_trace.c trap.c
Log Message:
cleanup includes (explicit inclusion of <powerpc/psl.h> or <powerpc/userret.h>)
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/powerpc/powerpc/db_interface.c
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/powerpc/powerpc/db_trace.c
cvs rdiff -u -r1.142 -r1.143 src/sys/arch/powerpc/powerpc/trap.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/powerpc/powerpc/db_interface.c
diff -u src/sys/arch/powerpc/powerpc/db_interface.c:1.46 src/sys/arch/powerpc/powerpc/db_interface.c:1.47
--- src/sys/arch/powerpc/powerpc/db_interface.c:1.46 Sat Jun 18 06:41:44 2011
+++ src/sys/arch/powerpc/powerpc/db_interface.c Mon Jun 20 05:59:06 2011
@@ -1,8 +1,8 @@
-/* $NetBSD: db_interface.c,v 1.46 2011/06/18 06:41:44 matt Exp $ */
+/* $NetBSD: db_interface.c,v 1.47 2011/06/20 05:59:06 matt Exp $ */
/* $OpenBSD: db_interface.c,v 1.2 1996/12/28 06:21:50 rahnds Exp $ */
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.46 2011/06/18 06:41:44 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.47 2011/06/20 05:59:06 matt Exp $");
#define USERACC
@@ -17,10 +17,11 @@
#include <dev/cons.h>
-#include <machine/db_machdep.h>
-#include <machine/frame.h>
+#include <powerpc/db_machdep.h>
+#include <powerpc/frame.h>
#include <powerpc/spr.h>
#include <powerpc/pte.h>
+#include <powerpc/psl.h>
#if defined (PPC_OEA) || defined(PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
#include <powerpc/oea/spr.h>
Index: src/sys/arch/powerpc/powerpc/db_trace.c
diff -u src/sys/arch/powerpc/powerpc/db_trace.c:1.55 src/sys/arch/powerpc/powerpc/db_trace.c:1.56
--- src/sys/arch/powerpc/powerpc/db_trace.c:1.55 Wed Jun 15 17:47:45 2011
+++ src/sys/arch/powerpc/powerpc/db_trace.c Mon Jun 20 05:59:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.55 2011/06/15 17:47:45 matt Exp $ */
+/* $NetBSD: db_trace.c,v 1.56 2011/06/20 05:59:06 matt Exp $ */
/* $OpenBSD: db_trace.c,v 1.3 1997/03/21 02:10:48 niklas Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.55 2011/06/15 17:47:45 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.56 2011/06/20 05:59:06 matt Exp $");
#include "opt_ppcarch.h"
@@ -42,6 +42,7 @@
#include <machine/pmap.h>
#include <powerpc/pcb.h>
+#include <powerpc/psl.h>
#include <powerpc/spr.h>
#if defined (PPC_OEA) || defined(PPC_OEA64) || defined (PPC_OEA64_BRIDGE)
#include <powerpc/oea/spr.h>
Index: src/sys/arch/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.142 src/sys/arch/powerpc/powerpc/trap.c:1.143
--- src/sys/arch/powerpc/powerpc/trap.c:1.142 Tue Jun 14 05:50:25 2011
+++ src/sys/arch/powerpc/powerpc/trap.c Mon Jun 20 05:59:06 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.142 2011/06/14 05:50:25 matt Exp $ */
+/* $NetBSD: trap.c,v 1.143 2011/06/20 05:59:06 matt Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.142 2011/06/14 05:50:25 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.143 2011/06/20 05:59:06 matt Exp $");
#include "opt_altivec.h"
#include "opt_ddb.h"
@@ -47,22 +47,21 @@
#include <sys/savar.h>
#include <sys/systm.h>
#include <sys/kauth.h>
+#include <sys/cpu.h>
#include <uvm/uvm_extern.h>
#include <dev/cons.h>
-#include <machine/cpu.h>
-#include <machine/db_machdep.h>
-#include <machine/fpu.h>
-#include <machine/frame.h>
-#include <machine/pcb.h>
-#include <machine/pmap.h>
-#include <machine/psl.h>
-#include <machine/trap.h>
#include <powerpc/altivec.h>
-#include <powerpc/userret.h>
+#include <powerpc/db_machdep.h>
+#include <powerpc/fpu.h>
+#include <powerpc/frame.h>
#include <powerpc/instr.h>
+#include <powerpc/pcb.h>
+#include <powerpc/pmap.h>
+#include <powerpc/trap.h>
+#include <powerpc/userret.h>
#include <powerpc/spr.h>
#include <powerpc/oea/spr.h>
