>Number:         7226
>Category:       port-mac68k
>Synopsis:       mac68k kernel won't compile after Mach VM removal
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    port-mac68k-maintainer (NetBSD/mac68k Portmaster)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Wed Mar 24 14:05:00 1999
>Last-Modified:
>Originator:     Dave Huang
>Organization:
Name: Dave Huang     |   Mammal, mammal / their names are called /
INet: khym@bga.com   |   they raise a paw / the bat, the cat /
FurryMUCK: Dahan     |   dolphin and dog / koala bear and hog -- TMBG
Dahan: Hani G Y+C 23 Y++ L+++ W- C++ T++ A+ E+ S++ V++ F- Q+++ P+ B+ PA+ PL++
>Release:        NetBSD-current as of March 24, 1999
>Environment:
	
System: NetBSD dahan.metonymy.com 1.3K NetBSD 1.3K (SPIFF) #275: Sat Mar 13 01:29:59 CST 1999 khym@dahan.metonymy.com:/usr/src.local/sys/arch/i386/compile/SPIFF i386


>Description:
	mac68k kernel doesn't compile anymore... locore.s won't
assemble because UVMEXP_INTRS isn't defined.
>How-To-Repeat:
	Try to compile a kernel.
>Fix:
--- /usr/src/sys/arch/mac68k/mac68k/genassym.cf	Thu Oct  1 06:10:09 1998
+++ genassym.cf	Wed Mar 24 15:18:27 1999
@@ -46,9 +46,7 @@
 
 include	<vm/vm.h>
 
-ifdef UVM
 include <uvm/uvm_extern.h>
-endif
 
 include	<machine/cpu.h>
 include	<machine/psl.h>
@@ -104,15 +102,7 @@
 define	SRUN			SRUN
 
 # interrupt/fault metering
-ifdef UVM
 define	UVMEXP_INTRS		offsetof(struct uvmexp, intrs)
-else
-define	V_SWTCH 		offsetof(struct vmmeter, v_swtch)
-define	V_TRAP			offsetof(struct vmmeter, v_trap)
-define	V_SYSCALL		offsetof(struct vmmeter, v_syscall)
-define	V_INTR			offsetof(struct vmmeter, v_intr)
-define	V_SOFT			offsetof(struct vmmeter, v_soft)
-endif
 
 # PSL values (should just include psl.h?)
 define	PSL_S			PSL_S

>Audit-Trail:
>Unformatted: