Module Name: src
Committed By: matt
Date: Mon Feb 22 20:17:09 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: compat_16_machdep.c
mips_softint.c process_machdep.c sig_machdep.c syscall.c
Log Message:
Explicitly include <mips/locore.h> since <mips/cpu.h> no longer includes it.
Use curcpu()->ci_data.cpu_nsyscall instead of uvmexp.syscalls.
To generate a diff of this commit:
cvs rdiff -u -r1.12.14.4 -r1.12.14.5 \
src/sys/arch/mips/mips/compat_16_machdep.c
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/arch/mips/mips/mips_softint.c
cvs rdiff -u -r1.29.62.3 -r1.29.62.4 src/sys/arch/mips/mips/process_machdep.c
cvs rdiff -u -r1.16.14.3 -r1.16.14.4 src/sys/arch/mips/mips/sig_machdep.c
cvs rdiff -u -r1.37.12.11 -r1.37.12.12 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/compat_16_machdep.c
diff -u src/sys/arch/mips/mips/compat_16_machdep.c:1.12.14.4 src/sys/arch/mips/mips/compat_16_machdep.c:1.12.14.5
--- src/sys/arch/mips/mips/compat_16_machdep.c:1.12.14.4 Mon Feb 1 04:16:19 2010
+++ src/sys/arch/mips/mips/compat_16_machdep.c Mon Feb 22 20:17:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_16_machdep.c,v 1.12.14.4 2010/02/01 04:16:19 matt Exp $ */
+/* $NetBSD: compat_16_machdep.c,v 1.12.14.5 2010/02/22 20:17:09 matt Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -45,7 +45,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.12.14.4 2010/02/01 04:16:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: compat_16_machdep.c,v 1.12.14.5 2010/02/22 20:17:09 matt Exp $");
#include "opt_cputype.h"
#include "opt_compat_netbsd.h"
@@ -68,6 +68,7 @@
#include <mips/regnum.h>
#include <mips/frame.h>
+#include <mips/locore.h>
#if !defined(__mips_o32)
#define fpreg fpreg_oabi
Index: src/sys/arch/mips/mips/mips_softint.c
diff -u src/sys/arch/mips/mips/mips_softint.c:1.1.2.5 src/sys/arch/mips/mips/mips_softint.c:1.1.2.6
--- src/sys/arch/mips/mips/mips_softint.c:1.1.2.5 Tue Feb 16 08:13:57 2010
+++ src/sys/arch/mips/mips/mips_softint.c Mon Feb 22 20:17:09 2010
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_softint.c,v 1.1.2.5 2010/02/16 08:13:57 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_softint.c,v 1.1.2.6 2010/02/22 20:17:09 matt Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -41,6 +41,7 @@
#include <uvm/uvm_extern.h>
#include <machine/intr.h>
+#include <mips/locore.h>
#ifdef __HAVE_FAST_SOFTINTS
Index: src/sys/arch/mips/mips/process_machdep.c
diff -u src/sys/arch/mips/mips/process_machdep.c:1.29.62.3 src/sys/arch/mips/mips/process_machdep.c:1.29.62.4
--- src/sys/arch/mips/mips/process_machdep.c:1.29.62.3 Mon Feb 1 04:16:19 2010
+++ src/sys/arch/mips/mips/process_machdep.c Mon Feb 22 20:17:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: process_machdep.c,v 1.29.62.3 2010/02/01 04:16:19 matt Exp $ */
+/* $NetBSD: process_machdep.c,v 1.29.62.4 2010/02/22 20:17:09 matt Exp $ */
/*
* Copyright (c) 1993 The Regents of the University of California.
@@ -76,7 +76,7 @@
*/
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.29.62.3 2010/02/01 04:16:19 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: process_machdep.c,v 1.29.62.4 2010/02/22 20:17:09 matt Exp $");
/*
* This file may seem a bit stylized, but that so that it's easier to port.
@@ -105,8 +105,10 @@
#include <sys/proc.h>
#include <sys/user.h>
#include <sys/ptrace.h>
+
#include <mips/reg.h>
#include <mips/regnum.h> /* symbolic register indices */
+#include <mips/locore.h>
int
process_read_regs(struct lwp *l, struct reg *regs)
Index: src/sys/arch/mips/mips/sig_machdep.c
diff -u src/sys/arch/mips/mips/sig_machdep.c:1.16.14.3 src/sys/arch/mips/mips/sig_machdep.c:1.16.14.4
--- src/sys/arch/mips/mips/sig_machdep.c:1.16.14.3 Mon Feb 1 04:16:20 2010
+++ src/sys/arch/mips/mips/sig_machdep.c Mon Feb 22 20:17:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: sig_machdep.c,v 1.16.14.3 2010/02/01 04:16:20 matt Exp $ */
+/* $NetBSD: sig_machdep.c,v 1.16.14.4 2010/02/22 20:17:09 matt Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.16.14.3 2010/02/01 04:16:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.16.14.4 2010/02/22 20:17:09 matt Exp $");
#include "opt_cputype.h"
#include "opt_compat_netbsd.h"
@@ -50,6 +50,7 @@
#include <mips/frame.h>
#include <mips/regnum.h>
+#include <mips/locore.h>
void *
getframe(struct lwp *l, int sig, int *onstack)
Index: src/sys/arch/mips/mips/syscall.c
diff -u src/sys/arch/mips/mips/syscall.c:1.37.12.11 src/sys/arch/mips/mips/syscall.c:1.37.12.12
--- src/sys/arch/mips/mips/syscall.c:1.37.12.11 Mon Feb 1 04:16:20 2010
+++ src/sys/arch/mips/mips/syscall.c Mon Feb 22 20:17:09 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.37.12.11 2010/02/01 04:16:20 matt Exp $ */
+/* $NetBSD: syscall.c,v 1.37.12.12 2010/02/22 20:17:09 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -107,7 +107,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.37.12.11 2010/02/01 04:16:20 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.37.12.12 2010/02/22 20:17:09 matt Exp $");
#if defined(_KERNEL_OPT)
#include "opt_sa.h"
@@ -127,6 +127,7 @@
#include <uvm/uvm_extern.h>
#include <machine/cpu.h>
+#include <mips/locore.h>
#include <mips/trap.h>
#include <mips/reg.h>
#include <mips/regnum.h> /* symbolic register indices */
@@ -186,7 +187,7 @@
LWP_CACHE_CREDS(l, p);
- uvmexp.syscalls++;
+ curcpu()->ci_data.cpu_nsyscall++;
if (cause & MIPS_CR_BR_DELAY)
reg->r_regs[_R_PC] = MachEmulateBranch(tf, opc, 0, 0);
