Module Name: src
Committed By: matt
Date: Sun Jul 10 23:21:59 UTC 2011
Modified Files:
src/sys/arch/mips/mips: cpu_exec.c db_disasm.c lock_stubs_llsc.S
locore_mips3.S mipsX_subr.S sig_machdep.c svr4_machdep.c syscall.c
Removed Files:
src/sys/arch/mips/mips: lock_stubs.S
Log Message:
More <machine/ include cleanup
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/arch/mips/mips/cpu_exec.c
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/mips/mips/db_disasm.c \
src/sys/arch/mips/mips/sig_machdep.c
cvs rdiff -u -r1.14 -r0 src/sys/arch/mips/mips/lock_stubs.S
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/mips/mips/lock_stubs_llsc.S
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/mips/mips/locore_mips3.S
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/mips/mips/mipsX_subr.S
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/mips/svr4_machdep.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/mips/mips/syscall.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/mips/mips/cpu_exec.c
diff -u src/sys/arch/mips/mips/cpu_exec.c:1.63 src/sys/arch/mips/mips/cpu_exec.c:1.64
--- src/sys/arch/mips/mips/cpu_exec.c:1.63 Fri Apr 29 22:12:22 2011
+++ src/sys/arch/mips/mips/cpu_exec.c Sun Jul 10 23:21:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu_exec.c,v 1.63 2011/04/29 22:12:22 matt Exp $ */
+/* $NetBSD: cpu_exec.c,v 1.64 2011/07/10 23:21:58 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.63 2011/04/29 22:12:22 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_exec.c,v 1.64 2011/07/10 23:21:58 matt Exp $");
#include "opt_compat_netbsd.h"
#include "opt_compat_ultrix.h"
@@ -58,9 +58,9 @@
#include <sys/exec_ecoff.h>
#endif
#include <sys/exec_elf.h> /* mandatory */
-#include <machine/reg.h>
-#include <mips/regnum.h> /* symbolic register indices */
#include <mips/locore.h>
+#include <mips/reg.h>
+#include <mips/regnum.h> /* symbolic register indices */
#include <compat/common/compat_util.h>
Index: src/sys/arch/mips/mips/db_disasm.c
diff -u src/sys/arch/mips/mips/db_disasm.c:1.22 src/sys/arch/mips/mips/db_disasm.c:1.23
--- src/sys/arch/mips/mips/db_disasm.c:1.22 Fri Apr 29 22:06:12 2011
+++ src/sys/arch/mips/mips/db_disasm.c Sun Jul 10 23:21:58 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_disasm.c,v 1.22 2011/04/29 22:06:12 matt Exp $ */
+/* $NetBSD: db_disasm.c,v 1.23 2011/07/10 23:21:58 matt Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -35,16 +35,15 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.22 2011/04/29 22:06:12 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.23 2011/07/10 23:21:58 matt Exp $");
-#include <sys/types.h>
-#include <sys/systm.h>
#include <sys/param.h>
+#include <sys/cpu.h>
+#include <sys/systm.h>
-#include <machine/reg.h>
-#include <machine/cpu.h>
+#include <mips/reg.h>
#include <mips/mips_opcode.h>
-/*#include <machine/param.h>*/
+
#include <machine/db_machdep.h>
#include <ddb/db_interface.h>
Index: src/sys/arch/mips/mips/sig_machdep.c
diff -u src/sys/arch/mips/mips/sig_machdep.c:1.22 src/sys/arch/mips/mips/sig_machdep.c:1.23
--- src/sys/arch/mips/mips/sig_machdep.c:1.22 Fri Apr 29 22:09:41 2011
+++ src/sys/arch/mips/mips/sig_machdep.c Sun Jul 10 23:21:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.22 2011/04/29 22:09:41 matt Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.23 2011/07/10 23:21:59 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,12 +31,12 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.22 2011/04/29 22:09:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.23 2011/07/10 23:21:59 matt Exp $");
#include "opt_cputype.h"
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/kernel.h>
#include <sys/proc.h>
#include <sys/signal.h>
@@ -44,8 +44,6 @@
#include <sys/mount.h>
#include <sys/syscallargs.h>
-#include <machine/cpu.h>
-
#include <mips/frame.h>
#include <mips/regnum.h>
#include <mips/locore.h>
Index: src/sys/arch/mips/mips/lock_stubs_llsc.S
diff -u src/sys/arch/mips/mips/lock_stubs_llsc.S:1.1 src/sys/arch/mips/mips/lock_stubs_llsc.S:1.2
--- src/sys/arch/mips/mips/lock_stubs_llsc.S:1.1 Sun Feb 20 07:45:47 2011
+++ src/sys/arch/mips/mips/lock_stubs_llsc.S Sun Jul 10 23:21:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: lock_stubs_llsc.S,v 1.1 2011/02/20 07:45:47 matt Exp $ */
+/* $NetBSD: lock_stubs_llsc.S,v 1.2 2011/07/10 23:21:59 matt Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -36,7 +36,7 @@
#include <sys/errno.h>
#include <machine/asm.h>
-#include <machine/cpu.h>
+#include <machine/cpu.h> /* MIPS_CURLWP */
#include "assym.h"
Index: src/sys/arch/mips/mips/locore_mips3.S
diff -u src/sys/arch/mips/mips/locore_mips3.S:1.99 src/sys/arch/mips/mips/locore_mips3.S:1.100
--- src/sys/arch/mips/mips/locore_mips3.S:1.99 Tue Apr 12 22:50:33 2011
+++ src/sys/arch/mips/mips/locore_mips3.S Sun Jul 10 23:21:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: locore_mips3.S,v 1.99 2011/04/12 22:50:33 matt Exp $ */
+/* $NetBSD: locore_mips3.S,v 1.100 2011/07/10 23:21:59 matt Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -87,11 +87,11 @@
#include "opt_kgdb.h"
#include <sys/cdefs.h>
+#include <sys/endian.h>
#include <mips/asm.h>
#include <mips/cpuregs.h>
#include <machine/param.h>
-#include <machine/endian.h>
#include "assym.h"
Index: src/sys/arch/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.49 src/sys/arch/mips/mips/mipsX_subr.S:1.50
--- src/sys/arch/mips/mips/mipsX_subr.S:1.49 Sat May 28 14:40:13 2011
+++ src/sys/arch/mips/mips/mipsX_subr.S Sun Jul 10 23:21:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsX_subr.S,v 1.49 2011/05/28 14:40:13 matt Exp $ */
+/* $NetBSD: mipsX_subr.S,v 1.50 2011/07/10 23:21:59 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -123,6 +123,7 @@
#include "opt_vmswap.h"
#include <sys/cdefs.h>
+#include <sys/endian.h>
#include <mips/asm.h>
#include <mips/cpuregs.h>
@@ -132,7 +133,6 @@
#include <mips/trap.h>
#include <machine/param.h>
-#include <machine/endian.h>
#include "assym.h"
Index: src/sys/arch/mips/mips/svr4_machdep.c
diff -u src/sys/arch/mips/mips/svr4_machdep.c:1.14 src/sys/arch/mips/mips/svr4_machdep.c:1.15
--- src/sys/arch/mips/mips/svr4_machdep.c:1.14 Sat Nov 21 17:40:28 2009
+++ src/sys/arch/mips/mips/svr4_machdep.c Sun Jul 10 23:21:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: svr4_machdep.c,v 1.14 2009/11/21 17:40:28 rmind Exp $ */
+/* $NetBSD: svr4_machdep.c,v 1.15 2011/07/10 23:21:59 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -36,21 +36,22 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.14 2009/11/21 17:40:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: svr4_machdep.c,v 1.15 2011/07/10 23:21:59 matt Exp $");
#include <sys/param.h>
-#include <sys/systm.h>
-#include <sys/proc.h>
+#include <sys/cpu.h>
#include <sys/exec.h>
+#include <sys/exec_elf.h>
#include <sys/kernel.h>
+#include <sys/mount.h>
+#include <sys/proc.h>
#include <sys/signal.h>
#include <sys/signalvar.h>
-#include <sys/mount.h>
#include <sys/syscallargs.h>
-#include <sys/exec_elf.h>
+#include <sys/sysctl.h>
+#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <sys/sysctl.h>
#include <compat/svr4/svr4_types.h>
#include <compat/svr4/svr4_ucontext.h>
@@ -59,9 +60,9 @@
#include <compat/svr4/svr4_util.h>
#include <compat/svr4/svr4_exec.h>
-#include <machine/cpu.h>
-#include <machine/psl.h>
-#include <machine/reg.h>
+#include <mips/psl.h>
+#include <mips/reg.h>
+
#include <machine/vmparam.h>
/*
Index: src/sys/arch/mips/mips/syscall.c
diff -u src/sys/arch/mips/mips/syscall.c:1.44 src/sys/arch/mips/mips/syscall.c:1.45
--- src/sys/arch/mips/mips/syscall.c:1.44 Sun Feb 20 07:45:48 2011
+++ src/sys/arch/mips/mips/syscall.c Sun Jul 10 23:21:59 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.44 2011/02/20 07:45:48 matt Exp $ */
+/* $NetBSD: syscall.c,v 1.45 2011/07/10 23:21:59 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -68,25 +68,25 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.44 2011/02/20 07:45:48 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.45 2011/07/10 23:21:59 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sa.h"
#endif
#include <sys/param.h>
-#include <sys/systm.h>
+#include <sys/cpu.h>
#include <sys/endian.h>
#include <sys/proc.h>
+#include <sys/sa.h>
+#include <sys/savar.h>
#include <sys/signal.h>
#include <sys/syscall.h>
#include <sys/syscallvar.h>
-#include <sys/sa.h>
-#include <sys/savar.h>
+#include <sys/systm.h>
#include <uvm/uvm_extern.h>
-#include <machine/cpu.h>
#include <mips/locore.h>
#include <mips/trap.h>
#include <mips/reg.h>
