[src/trunk]: src/sys/arch Hopefully get the last of the "ifdef UVM" bogons in...

[simonb <simonb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d6d784404e65
branches:  trunk
changeset: 467730:d6d784404e65
user:      simonb <simonb%NetBSD.org@localhost>
date:      Sun Mar 28 06:00:18 1999 +0000

description:
Hopefully get the last of the "ifdef UVM" bogons in genassym.cf's.

diffstat:

 sys/arch/atari/atari/genassym.cf |  11 ++---------
 sys/arch/hp300/hp300/genassym.cf |   9 +--------
 2 files changed, 3 insertions(+), 17 deletions(-)

diffs (66 lines):

diff -r 34ec009745ee -r d6d784404e65 sys/arch/atari/atari/genassym.cf
--- a/sys/arch/atari/atari/genassym.cf  Sun Mar 28 05:46:53 1999 +0000
+++ b/sys/arch/atari/atari/genassym.cf  Sun Mar 28 06:00:18 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.9 1998/10/01 00:29:52 thorpej Exp $
+#      $NetBSD: genassym.cf,v 1.10 1999/03/28 06:00:18 simonb Exp $
 
 #-
 # Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -45,9 +45,7 @@
 include <sys/user.h>
 
 include <vm/vm.h>
-ifdef UVM
 include <uvm/uvm_extern.h>
-endif
 
 include <machine/cpu.h>
 include <machine/trap.h>
@@ -88,13 +86,8 @@
 define SRUN                    SRUN
 
 # interrupt/fault metering
-# interrupt/fault metering
-ifdef UVM
 define UVMEXP_INTRS            offsetof(struct uvmexp, intrs)
-else
-define V_INTR                  offsetof(struct vmmeter, v_intr)
-endif
-       
+
 # general constants
 define UPAGES                  UPAGES
 define USPACE                  USPACE
diff -r 34ec009745ee -r d6d784404e65 sys/arch/hp300/hp300/genassym.cf
--- a/sys/arch/hp300/hp300/genassym.cf  Sun Mar 28 05:46:53 1999 +0000
+++ b/sys/arch/hp300/hp300/genassym.cf  Sun Mar 28 06:00:18 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.13 1998/10/01 00:29:52 thorpej Exp $
+#      $NetBSD: genassym.cf,v 1.14 1999/03/28 06:00:18 simonb Exp $
 
 #
 # Copyright (c) 1982, 1990, 1993
@@ -45,10 +45,7 @@
 include <sys/user.h>
 
 include <vm/vm.h>
-
-ifdef UVM
 include <uvm/uvm_extern.h>
-endif
 
 include <machine/hp300spu.h>
 include <machine/cpu.h>
@@ -153,11 +150,7 @@
 define SRUN                    SRUN
 
 # interrupt/fault metering
-ifdef UVM
 define UVMEXP_INTRS            offsetof(struct uvmexp, intrs)
-else
-define V_INTR                  offsetof(struct vmmeter, v_intr)
-endif
 
 # PSL values (should just include psl.h?)
 define PSL_S                   PSL_S