Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys Move counting of faults, traps, intrs, soft[intr]s, sysc...
details: https://anonhg.NetBSD.org/src/rev/9df39d3fc899
branches: trunk
changeset: 759905:9df39d3fc899
user: matt <matt%NetBSD.org@localhost>
date: Mon Dec 20 00:25:23 2010 +0000
description:
Move counting of faults, traps, intrs, soft[intr]s, syscalls, and nswtch
from uvmexp to per-cpu cpu_data and move them to 64bits. Remove unneeded
includes of <uvm/uvm_extern.h> and/or <uvm/uvm.h>.
diffstat:
sys/arch/acorn26/acorn26/except.c | 10 ++--
sys/arch/acorn26/acorn26/irq.c | 8 +--
sys/arch/algor/algor/interrupt.c | 8 +-
sys/arch/alpha/alpha/interrupt.c | 10 +--
sys/arch/alpha/alpha/linux_syscall.c | 10 +--
sys/arch/alpha/alpha/osf1_syscall.c | 10 +--
sys/arch/alpha/alpha/syscall.c | 10 +--
sys/arch/alpha/alpha/trap.c | 8 +-
sys/arch/amd64/amd64/db_interface.c | 6 +-
sys/arch/amd64/amd64/db_memrw.c | 6 +-
sys/arch/amd64/amd64/fpu.c | 6 +-
sys/arch/amd64/amd64/genassym.cf | 6 +-
sys/arch/amd64/amd64/kgdb_machdep.c | 6 +-
sys/arch/amd64/amd64/linux32_syscall.c | 6 +-
sys/arch/amd64/amd64/linux_syscall.c | 6 +-
sys/arch/amd64/amd64/locore.S | 4 +-
sys/arch/amd64/amd64/netbsd32_syscall.c | 6 +-
sys/arch/amd64/amd64/process_machdep.c | 6 +-
sys/arch/amd64/amd64/rbus_machdep.c | 6 +-
sys/arch/amd64/amd64/trap.c | 6 +-
sys/arch/amd64/amd64/vector.S | 14 ++---
sys/arch/amiga/amiga/amiga_init.c | 8 ++-
sys/arch/amiga/amiga/cc.c | 6 +-
sys/arch/amiga/amiga/genassym.cf | 6 +-
sys/arch/amiga/amiga/locore.s | 47 +++++++++---------
sys/arch/amiga/amiga/trap.c | 6 +-
sys/arch/amiga/dev/afsc.c | 6 +-
sys/arch/amiga/dev/bzivsc.c | 6 +-
sys/arch/amiga/dev/bzsc.c | 6 +-
sys/arch/amiga/dev/bztzsc.c | 6 +-
sys/arch/amiga/dev/cbiiisc.c | 7 +-
sys/arch/amiga/dev/cbiisc.c | 6 +-
sys/arch/amiga/dev/cbsc.c | 6 +-
sys/arch/amiga/dev/drbbc.c | 6 +-
sys/arch/amiga/dev/drsc.c | 6 +-
sys/arch/amiga/dev/drsupio.c | 6 +-
sys/arch/amiga/dev/fd.c | 6 +-
sys/arch/amiga/dev/flsc.c | 6 +-
sys/arch/amiga/dev/grf.c | 5 +-
sys/arch/amiga/dev/grf_cc.c | 6 +-
sys/arch/amiga/dev/grfabs_cc.c | 6 +-
sys/arch/amiga/dev/mgnsc.c | 6 +-
sys/arch/amiga/dev/sbic.c | 5 +-
sys/arch/amiga/dev/sci.c | 6 +-
sys/arch/amiga/dev/siop.c | 6 +-
sys/arch/amiga/dev/siop2.c | 6 +-
sys/arch/amiga/dev/wesc.c | 6 +-
sys/arch/amiga/dev/zbus.c | 10 +--
sys/arch/amiga/dev/zssc.c | 6 +-
sys/arch/arc/arc/interrupt.c | 8 +--
sys/arch/arm/arm/ast.c | 8 +-
sys/arch/arm/arm/syscall.c | 6 +-
sys/arch/arm/arm/undefined.c | 6 +-
sys/arch/arm/arm32/fault.c | 8 +-
sys/arch/arm/arm32/genassym.cf | 10 ++--
sys/arch/arm/arm32/intr.c | 6 +-
sys/arch/arm/at91/at91aic.c | 6 +-
sys/arch/arm/ep93xx/ep93xx_intr.c | 10 +--
sys/arch/arm/footbridge/footbridge_irqhandler.c | 7 +-
sys/arch/arm/gemini/gemini_icu.c | 6 +-
sys/arch/arm/imx/imx51_tzic.c | 6 +-
sys/arch/arm/iomd/iomd_irq.S | 34 ++++++------
sys/arch/arm/iomd/iomd_irqhandler.c | 5 +-
sys/arch/arm/ixp12x0/ixp12x0_intr.c | 10 +--
sys/arch/arm/marvell/mvsoc_intr.c | 8 +--
sys/arch/arm/ofw/ofw_irq.S | 20 ++++---
sys/arch/arm/ofw/ofw_irqhandler.c | 6 +-
sys/arch/arm/omap/omap2430_intr.c | 8 +--
sys/arch/arm/omap/omap2_icu.c | 6 +-
sys/arch/arm/omap/omap5912_intr.c | 5 +-
sys/arch/arm/omap/omap_intr.c | 5 +-
sys/arch/arm/s3c2xx0/s3c2410_intr.c | 7 +-
sys/arch/arm/s3c2xx0/s3c2800_intr.c | 7 +-
sys/arch/arm/s3c2xx0/s3c2xx0_intr.c | 7 +-
sys/arch/arm/sa11x0/sa11x0_irq.S | 20 ++++---
sys/arch/arm/sa11x0/sa11x0_irqhandler.c | 5 +-
sys/arch/arm/xscale/becc_icu.c | 6 +-
sys/arch/arm/xscale/i80321_icu.c | 6 +-
sys/arch/arm/xscale/ixp425_intr.c | 8 +--
sys/arch/atari/atari/genassym.cf | 4 +-
sys/arch/atari/atari/intr.c | 8 +--
sys/arch/atari/atari/locore.s | 62 +++++++++++++-----------
sys/arch/atari/atari/trap.c | 8 +-
sys/arch/atari/dev/hdfd_intr.s | 16 +++---
sys/arch/cesfic/cesfic/genassym.cf | 4 +-
sys/arch/cesfic/cesfic/isr.c | 6 +-
sys/arch/cesfic/cesfic/locore.s | 9 +--
sys/arch/cesfic/cesfic/trap.c | 8 +-
sys/arch/cobalt/cobalt/interrupt.c | 8 +--
sys/arch/dreamcast/dreamcast/machdep.c | 6 +-
sys/arch/evbarm/ifpga/ifpga_intr.c | 6 +-
sys/arch/evbarm/iq80310/iq80310_intr.c | 8 +--
sys/arch/evbmips/evbmips/interrupt.c | 8 +--
sys/arch/evbppc/ev64260/machdep.c | 5 +-
sys/arch/evbppc/obs405/obs200_machdep.c | 5 +-
sys/arch/evbppc/obs405/obs266_machdep.c | 5 +-
sys/arch/evbppc/obs405/obs600_machdep.c | 5 +-
sys/arch/evbppc/obs405/rbus_machdep.c | 4 +-
sys/arch/evbppc/pmppc/machdep.c | 5 +-
sys/arch/evbppc/pmppc/pic_cpc700.c | 6 +-
sys/arch/evbsh3/evbsh3/machdep.c | 6 +-
sys/arch/ews4800mips/ews4800mips/interrupt.c | 8 +--
sys/arch/hp300/hp300/genassym.cf | 4 +-
sys/arch/hp300/hp300/intr.c | 8 +--
sys/arch/hp300/hp300/locore.s | 26 ++++------
sys/arch/hp300/hp300/trap.c | 8 +-
sys/arch/hp700/hp700/intr.c | 10 ++--
sys/arch/hpcarm/hpcarm/intr.c | 8 +--
sys/arch/hpcmips/hpcmips/interrupt.c | 6 +-
sys/arch/hpcmips/tx/tx39icu.c | 6 +-
sys/arch/hpcmips/vr/vr.c | 6 +-
sys/arch/hpcsh/hpcsh/machdep.c | 6 +-
sys/arch/hppa/hppa/trap.c | 10 ++--
sys/arch/i386/i386/genassym.cf | 7 +-
sys/arch/i386/i386/locore.S | 7 +-
sys/arch/i386/i386/trap.c | 6 +-
sys/arch/i386/i386/vector.S | 18 ++++---
sys/arch/i386/isa/npx.c | 6 +-
sys/arch/ia64/ia64/genassym.cf | 6 +-
sys/arch/ia64/ia64/interrupt.c | 8 +--
sys/arch/landisk/landisk/intr.c | 6 +-
sys/arch/luna68k/luna68k/genassym.cf | 4 +-
sys/arch/luna68k/luna68k/isr.c | 8 +-
sys/arch/luna68k/luna68k/locore.s | 9 +--
sys/arch/luna68k/luna68k/trap.c | 8 +-
sys/arch/m68k/include/asm.h | 27 ++++++++++-
sys/arch/m68k/m68k/m68k_syscall.c | 6 +-
sys/arch/mac68k/mac68k/genassym.cf | 4 +-
sys/arch/mac68k/mac68k/intr.c | 8 +--
sys/arch/mac68k/mac68k/locore.s | 13 ++--
sys/arch/mac68k/mac68k/trap.c | 8 +-
sys/arch/macppc/dev/am79c950.c | 6 +-
sys/arch/macppc/dev/awacs.c | 6 +-
sys/arch/macppc/dev/dbcool_ki2c.c | 6 +-
sys/arch/macppc/dev/deq.c | 6 +-
sys/arch/macppc/dev/esp.c | 6 +-
sys/arch/macppc/dev/if_mc.c | 6 +-
sys/arch/macppc/dev/ki2c.c | 3 +-
sys/arch/macppc/dev/mediabay.c | 6 +-
sys/arch/macppc/dev/ofb.c | 6 +-
sys/arch/macppc/macppc/cpu.c | 5 +-
sys/arch/macppc/macppc/ipi_hammerhead.c | 6 +-
sys/arch/macppc/macppc/machdep.c | 6 +-
sys/arch/macppc/macppc/pic_heathrow.c | 6 +-
sys/arch/macppc/macppc/pic_ohare.c | 6 +-
sys/arch/macppc/macppc/rbus_machdep.c | 6 +-
sys/arch/macppc/pci/pci_machdep.c | 6 +-
sys/arch/mips/adm5120/dev/admpci.c | 7 +-
sys/arch/mips/mips/genassym.cf | 4 +-
sys/arch/mips/mips/syscall.c | 6 +-
sys/arch/mips/mips/trap.c | 8 +-
sys/arch/mipsco/mipsco/interrupt.c | 8 +--
sys/arch/mmeye/mmeye/machdep.c | 6 +-
sys/arch/mvme68k/mvme68k/genassym.cf | 4 +-
sys/arch/mvme68k/mvme68k/isr.c | 8 +-
sys/arch/mvme68k/mvme68k/trap.c | 6 +-
sys/arch/mvmeppc/mvmeppc/machdep.c | 6 +-
sys/arch/mvmeppc/pci/pci_machdep.c | 6 +-
sys/arch/news68k/dev/timer_hb.c | 6 +-
sys/arch/news68k/news68k/genassym.cf | 4 +-
sys/arch/news68k/news68k/isr.c | 8 +-
sys/arch/news68k/news68k/locore.s | 15 ++---
sys/arch/news68k/news68k/machdep.c | 8 +-
sys/arch/news68k/news68k/trap.c | 6 +-
sys/arch/newsmips/newsmips/machdep.c | 6 +-
sys/arch/next68k/next68k/genassym.cf | 4 +-
sys/arch/next68k/next68k/isr.c | 8 +-
sys/arch/next68k/next68k/locore.s | 9 +--
sys/arch/next68k/next68k/trap.c | 8 +-
sys/arch/ofppc/ofppc/cpu.c | 6 +-
sys/arch/pmax/pmax/interrupt.c | 8 +--
sys/arch/powerpc/ibm4xx/clock.c | 22 +++++---
sys/arch/powerpc/ibm4xx/intr.c | 18 +++---
sys/arch/powerpc/ibm4xx/trap.c | 8 +-
sys/arch/powerpc/pic/intr.c | 11 ++--
sys/arch/powerpc/powerpc/clock.c | 6 +-
sys/arch/powerpc/powerpc/trap.c | 8 +-
sys/arch/sandpoint/pci/pci_machdep.c | 6 +-
sys/arch/sandpoint/sandpoint/machdep.c | 5 +-
sys/arch/sbmips/sbmips/sb1250_icu.c | 12 ++--
sys/arch/sgimips/sgimips/cpu.c | 6 +-
sys/arch/sh3/sh3/exception.c | 8 +-
sys/arch/sh3/sh3/exception_vector.S | 11 +---
sys/arch/sh3/sh3/genassym.cf | 5 +-
sys/arch/sh3/sh3/interrupt.c | 6 +-
sys/arch/sh3/sh3/syscall.c | 6 +-
sys/arch/shark/isa/isa_irq.S | 15 ++---
sys/arch/shark/isa/isa_irqhandler.c | 6 +-
sys/arch/sparc/include/asm.h | 19 +++++++-
sys/arch/sparc/sparc/amd7930intr.s | 9 +--
sys/arch/sparc/sparc/bsd_fdintr.s | 9 +--
sys/arch/sparc/sparc/genassym.cf | 8 +-
sys/arch/sparc/sparc/locore.s | 43 +++++++---------
sys/arch/sparc/sparc/machdep.c | 20 ++++----
sys/arch/sparc/sparc/syscall.c | 8 +-
sys/arch/sparc/sparc/trap.c | 10 ++--
sys/arch/sparc64/sparc64/genassym.cf | 8 +--
sys/arch/sparc64/sparc64/locore.s | 10 ++--
sys/arch/sparc64/sparc64/trap.c | 14 ++--
sys/arch/sun2/sun2/trap.c | 6 +-
sys/arch/sun3/sun3/clock.c | 6 +-
sys/arch/sun3/sun3/trap.c | 6 +-
sys/arch/sun3/sun3x/clock.c | 6 +-
sys/arch/sun68k/sun68k/isr.c | 8 +-
sys/arch/vax/vax/genassym.cf | 7 +-
sys/arch/vax/vax/intvec.S | 17 ++++--
sys/arch/vax/vax/subr.S | 7 ++-
sys/arch/vax/vax/syscall.c | 27 +++-------
sys/arch/vax/vax/trap.c | 23 +++------
sys/arch/x68k/x68k/genassym.cf | 4 +-
sys/arch/x68k/x68k/locore.s | 26 +++++-----
sys/arch/x68k/x68k/trap.c | 8 +-
sys/arch/x86/pci/pci_intr_machdep.c | 6 +-
sys/arch/xen/xen/evtchn.c | 7 +-
sys/kern/kern_clock.c | 16 +-----
sys/kern/kern_softint.c | 6 +-
sys/miscfs/procfs/procfs_linux.c | 22 +++++---
sys/sys/cpu_data.h | 11 ++-
sys/ufs/ffs/ffs_snapshot.c | 7 +-
sys/uvm/uvm_extern.h | 14 ++--
sys/uvm/uvm_fault.c | 6 +-
sys/uvm/uvm_meter.c | 23 +++++---
sys/uvm/uvm_stat.c | 20 ++++++--
223 files changed, 917 insertions(+), 1045 deletions(-)
diffs (truncated from 7499 to 300 lines):
diff -r 585cc1414f49 -r 9df39d3fc899 sys/arch/acorn26/acorn26/except.c
--- a/sys/arch/acorn26/acorn26/except.c Mon Dec 20 00:14:40 2010 +0000
+++ b/sys/arch/acorn26/acorn26/except.c Mon Dec 20 00:25:23 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: except.c,v 1.26 2010/11/15 06:05:27 uebayasi Exp $ */
+/* $NetBSD: except.c,v 1.27 2010/12/20 00:25:23 matt Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 Ben Harris
* All rights reserved.
@@ -31,7 +31,7 @@
#include <sys/param.h>
-__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.26 2010/11/15 06:05:27 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: except.c,v 1.27 2010/12/20 00:25:23 matt Exp $");
#include "opt_ddb.h"
@@ -108,7 +108,7 @@
* p15).
*/
- uvmexp.traps++;
+ curcpu()->ci_data.cpu_ntrap++;
l = curlwp;
if (l == NULL)
l = &lwp0;
@@ -166,7 +166,7 @@
/* Enable interrupts if they were enabled before the trap. */
if ((tf->tf_r15 & R15_IRQ_DISABLE) == 0)
int_on();
- uvmexp.traps++;
+ curcpu()->ci_data.cpu_ntrap++;
l = curlwp;
if (l == NULL)
l = &lwp0;
@@ -478,7 +478,7 @@
/* Enable interrupts if they were enabled before the trap. */
if ((tf->tf_r15 & R15_IRQ_DISABLE) == 0)
int_on();
- uvmexp.traps++;
+ curcpu()->ci_data.cpu_ntrap++;
l = curlwp;
if (l == NULL)
l = &lwp0;
diff -r 585cc1414f49 -r 9df39d3fc899 sys/arch/acorn26/acorn26/irq.c
--- a/sys/arch/acorn26/acorn26/irq.c Mon Dec 20 00:14:40 2010 +0000
+++ b/sys/arch/acorn26/acorn26/irq.c Mon Dec 20 00:25:23 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: irq.c,v 1.15 2009/03/18 10:22:21 cegger Exp $ */
+/* $NetBSD: irq.c,v 1.16 2010/12/20 00:25:23 matt Exp $ */
/*-
* Copyright (c) 2000, 2001 Ben Harris
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: irq.c,v 1.15 2009/03/18 10:22:21 cegger Exp $");
+__KERNEL_RCSID(0, "$NetBSD: irq.c,v 1.16 2010/12/20 00:25:23 matt Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -44,8 +44,6 @@
#include <sys/intr.h>
#include <sys/cpu.h>
-#include <uvm/uvm_extern.h>
-
#include <machine/frame.h>
#include <machine/irq.h>
#include <machine/machdep.h>
@@ -141,7 +139,7 @@
#if 0
printf("*");
#endif
- uvmexp.intrs++;
+ curcpu()->ci_data.cpu_nintr++;
stray = 1;
#if NFIQ > 0
diff -r 585cc1414f49 -r 9df39d3fc899 sys/arch/algor/algor/interrupt.c
--- a/sys/arch/algor/algor/interrupt.c Mon Dec 20 00:14:40 2010 +0000
+++ b/sys/arch/algor/algor/interrupt.c Mon Dec 20 00:25:23 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.14 2009/12/14 00:45:59 matt Exp $ */
+/* $NetBSD: interrupt.c,v 1.15 2010/12/20 00:25:23 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.14 2009/12/14 00:45:59 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.15 2010/12/20 00:25:23 matt Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -41,7 +41,7 @@
#include <sys/intr.h>
#include <sys/cpu.h>
-#include <uvm/uvm_extern.h>
+//#include <uvm/uvm_extern.h>
#include <machine/autoconf.h>
#include <machine/locore.h>
@@ -116,7 +116,7 @@
ci = curcpu();
ci->ci_idepth++;
- uvmexp.intrs++;
+ ci->ci_data.cpu_nintr++;
if (ipending & MIPS_INT_MASK_5) {
diff -r 585cc1414f49 -r 9df39d3fc899 sys/arch/alpha/alpha/interrupt.c
--- a/sys/arch/alpha/alpha/interrupt.c Mon Dec 20 00:14:40 2010 +0000
+++ b/sys/arch/alpha/alpha/interrupt.c Mon Dec 20 00:25:23 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.78 2008/04/28 20:23:10 martin Exp $ */
+/* $NetBSD: interrupt.c,v 1.79 2010/12/20 00:25:24 matt Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.78 2008/04/28 20:23:10 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.79 2010/12/20 00:25:24 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -80,8 +80,6 @@
#include <sys/cpu.h>
#include <sys/atomic.h>
-#include <uvm/uvm_extern.h>
-
#include <machine/cpuvar.h>
#include <machine/autoconf.h>
#include <machine/reg.h>
@@ -227,7 +225,7 @@
* time would be counted as interrupt time.
*/
sc->sc_evcnt_clock.ev_count++;
- uvmexp.intrs++;
+ ci->ci_data.cpu_nintr++;
if (platform.clockintr) {
/*
* Call hardclock(). This will also call
@@ -271,7 +269,7 @@
if (!mpsafe) {
KERNEL_LOCK(1, NULL);
}
- uvmexp.intrs++;
+ ci->ci_data.cpu_nintr++;
scb = &scb_iovectab[idx];
(*scb->scb_func)(scb->scb_arg, a1);
if (!mpsafe)
diff -r 585cc1414f49 -r 9df39d3fc899 sys/arch/alpha/alpha/linux_syscall.c
--- a/sys/arch/alpha/alpha/linux_syscall.c Mon Dec 20 00:14:40 2010 +0000
+++ b/sys/arch/alpha/alpha/linux_syscall.c Mon Dec 20 00:25:23 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_syscall.c,v 1.30 2009/11/21 05:35:40 rmind Exp $ */
+/* $NetBSD: linux_syscall.c,v 1.31 2010/12/20 00:25:24 matt Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.30 2009/11/21 05:35:40 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: linux_syscall.c,v 1.31 2010/12/20 00:25:24 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,8 +98,6 @@
#include <sys/syscall.h>
#include <sys/syscallvar.h>
-#include <uvm/uvm_extern.h>
-
#include <machine/cpu.h>
#include <machine/reg.h>
#include <machine/alpha.h>
@@ -151,7 +149,7 @@
LWP_CACHE_CREDS(l, p);
- uvmexp.syscalls++;
+ curcpu()->ci_data.cpu_nsyscall++;
l->l_md.md_tf = framep;
callp = p->p_emul->e_sysent;
@@ -235,7 +233,7 @@
LWP_CACHE_CREDS(l, p);
- uvmexp.syscalls++;
+ curcpu()->ci_data.cpu_nsyscall++;
l->l_md.md_tf = framep;
callp = p->p_emul->e_sysent;
diff -r 585cc1414f49 -r 9df39d3fc899 sys/arch/alpha/alpha/osf1_syscall.c
--- a/sys/arch/alpha/alpha/osf1_syscall.c Mon Dec 20 00:14:40 2010 +0000
+++ b/sys/arch/alpha/alpha/osf1_syscall.c Mon Dec 20 00:25:23 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: osf1_syscall.c,v 1.32 2009/11/21 05:35:40 rmind Exp $ */
+/* $NetBSD: osf1_syscall.c,v 1.33 2010/12/20 00:25:24 matt Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: osf1_syscall.c,v 1.32 2009/11/21 05:35:40 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: osf1_syscall.c,v 1.33 2010/12/20 00:25:24 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -98,8 +98,6 @@
#include <sys/syscall.h>
#include <sys/syscallvar.h>
-#include <uvm/uvm_extern.h>
-
#include <machine/cpu.h>
#include <machine/reg.h>
#include <machine/alpha.h>
@@ -148,7 +146,7 @@
LWP_CACHE_CREDS(l, p);
- uvmexp.syscalls++;
+ curcpu()->ci_data.cpu_nsyscall++;
l->l_md.md_tf = framep;
callp = p->p_emul->e_sysent;
@@ -232,7 +230,7 @@
LWP_CACHE_CREDS(l, p);
- uvmexp.syscalls++;
+ curcpu()->ci_data.cpu_nsyscall++;
l->l_md.md_tf = framep;
callp = p->p_emul->e_sysent;
diff -r 585cc1414f49 -r 9df39d3fc899 sys/arch/alpha/alpha/syscall.c
--- a/sys/arch/alpha/alpha/syscall.c Mon Dec 20 00:14:40 2010 +0000
+++ b/sys/arch/alpha/alpha/syscall.c Mon Dec 20 00:25:23 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: syscall.c,v 1.36 2010/02/25 07:14:48 skrll Exp $ */
+/* $NetBSD: syscall.c,v 1.37 2010/12/20 00:25:24 matt Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -89,7 +89,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.36 2010/02/25 07:14:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.37 2010/12/20 00:25:24 matt Exp $");
#include "opt_sa.h"
@@ -103,8 +103,6 @@
#include <sys/syscallvar.h>
#include <sys/ktrace.h>
-#include <uvm/uvm_extern.h>
-
#include <machine/cpu.h>
#include <machine/reg.h>
#include <machine/alpha.h>
@@ -148,7 +146,7 @@
LWP_CACHE_CREDS(l, p);
- uvmexp.syscalls++;
+ curcpu()->ci_data.cpu_nsyscall++;
l->l_md.md_tf = framep;
callp = p->p_emul->e_sysent;
@@ -242,7 +240,7 @@
LWP_CACHE_CREDS(l, p);
- uvmexp.syscalls++;
+ curcpu()->ci_data.cpu_nsyscall++;
l->l_md.md_tf = framep;
callp = p->p_emul->e_sysent;
diff -r 585cc1414f49 -r 9df39d3fc899 sys/arch/alpha/alpha/trap.c
--- a/sys/arch/alpha/alpha/trap.c Mon Dec 20 00:14:40 2010 +0000
+++ b/sys/arch/alpha/alpha/trap.c Mon Dec 20 00:25:23 2010 +0000
Home |
Main Index |
Thread Index |
Old Index