diff --git a/sys/src/9/bcm/fns.h b/sys/src/9/bcm/fns.h
index 6060a964b..b7d0784a6 100644
--- a/sys/src/9/bcm/fns.h
+++ b/sys/src/9/bcm/fns.h
@@ -133,8 +133,6 @@ extern void sysprocsetup(Proc*);
 #define	kmapinval()
 #define countpagerefs(a, b)
 
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
 #define KADDR(pa)	((void*)(KZERO | ((uintptr)(pa) & ~KSEGM)))
 #define PADDR(va)	(PHYSDRAM | ((uintptr)(va) & ~KSEGM))
 
diff --git a/sys/src/9/bcm64/fns.h b/sys/src/9/bcm64/fns.h
index ddabedd98..e6acd4ffe 100644
--- a/sys/src/9/bcm64/fns.h
+++ b/sys/src/9/bcm64/fns.h
@@ -1,7 +1,5 @@
 #include "../port/portfns.h"
 
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
 /* l.s */
 extern void sev(void);
 extern int tas(void *);
diff --git a/sys/src/9/cycv/fns.h b/sys/src/9/cycv/fns.h
index 60c642ee1..61b240d29 100644
--- a/sys/src/9/cycv/fns.h
+++ b/sys/src/9/cycv/fns.h
@@ -16,7 +16,6 @@ void procsetup(Proc *);
 KMap* kmap(Page *);
 void kunmap(KMap *);
 
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
 #define getpgcolor(a) 0
 #define kmapinval()
 #define KADDR(a) kaddr(a)
diff --git a/sys/src/9/kw/fns.h b/sys/src/9/kw/fns.h
index 64feffc6a..a8eecbc3b 100644
--- a/sys/src/9/kw/fns.h
+++ b/sys/src/9/kw/fns.h
@@ -143,8 +143,6 @@ void	vunmap(void*, usize);
 #define	getpgcolor(a)	0
 #define	kmapinval()
 
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
 /*
  * this low-level printing stuff is ugly,
  * but there appears to be no other way to
diff --git a/sys/src/9/mtx/fns.h b/sys/src/9/mtx/fns.h
index c34a338fb..716751a17 100644
--- a/sys/src/9/mtx/fns.h
+++ b/sys/src/9/mtx/fns.h
@@ -89,6 +89,5 @@ void	tlbflushall(void);
 #define	userureg(ur) (((ur)->status & MSR_PR) != 0)
 void	watchreset(void);
 
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
 #define KADDR(a)	((void*)((ulong)(a)|KZERO))
 #define PADDR(a)	((ulong)(a)&~KZERO)
diff --git a/sys/src/9/omap/fns.h b/sys/src/9/omap/fns.h
index 1515f4fba..b778b6455 100644
--- a/sys/src/9/omap/fns.h
+++ b/sys/src/9/omap/fns.h
@@ -160,8 +160,6 @@ void	vunmap(void*, usize);
 #define	getpgcolor(a)	0
 #define	kmapinval()
 
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
 #define KADDR(pa)	((void*)(KZERO | ((uintptr)(pa) & ~KSEGM)))
 #define PADDR(va)	(PHYSDRAM | ((uintptr)(va) & ~KSEGM))
 
diff --git a/sys/src/9/pc/fns.h b/sys/src/9/pc/fns.h
index 436bb4817..89ffd5e19 100644
--- a/sys/src/9/pc/fns.h
+++ b/sys/src/9/pc/fns.h
@@ -175,6 +175,5 @@ int	xchgw(ushort*, int);
 void	rdrandbuf(void*, ulong);
 
 #define	userureg(ur)	(((ur)->cs & 3) == 3)
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
 #define	KADDR(a)	kaddr(a)
 #define PADDR(a)	paddr((void*)(a))
diff --git a/sys/src/9/pc64/fns.h b/sys/src/9/pc64/fns.h
index 75764f06d..b58c7e3a4 100644
--- a/sys/src/9/pc64/fns.h
+++ b/sys/src/9/pc64/fns.h
@@ -177,6 +177,5 @@ int	xchgw(ushort*, int);
 void	rdrandbuf(void*, ulong);
 
 #define	userureg(ur)	(((ur)->cs & 3) == 3)
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
 #define	KADDR(a)	kaddr(a)
 #define PADDR(a)	paddr((void*)(a))
diff --git a/sys/src/9/port/portfns.h b/sys/src/9/port/portfns.h
index 47da9752d..99da20d10 100644
--- a/sys/src/9/port/portfns.h
+++ b/sys/src/9/port/portfns.h
@@ -230,6 +230,7 @@ ulong		perfticks(void);
 void		pexit(char*, int);
 void		pgrpcpy(Pgrp*, Pgrp*);
 ulong		pidalloc(Proc*);
+#define		waserror()		setlabel(&up->errlab[up->nerrlab++])
 #define		poperror()		up->nerrlab--
 void		portcountpagerefs(ulong*, int);
 int		postnote(Proc*, int, char*, int);
diff --git a/sys/src/9/ppc/fns.h b/sys/src/9/ppc/fns.h
index 68195a729..959157512 100644
--- a/sys/src/9/ppc/fns.h
+++ b/sys/src/9/ppc/fns.h
@@ -100,7 +100,6 @@ void	touser(void*);
 void	trapinit(void);
 void	trapvec(void);
 #define	userureg(ur) (((ur)->status & MSR_PR) != 0)
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
 #define KADDR(a)	((void*)((ulong)(a)|KZERO))
 #define PADDR(a)	((((ulong)(a)&0xf0000000)==0xf0000000)?(ulong)(a):((ulong)(a)&~KZERO))
 #define coherence()	eieio()
diff --git a/sys/src/9/sgi/fns.h b/sys/src/9/sgi/fns.h
index 8ae58e938..56e8c358c 100644
--- a/sys/src/9/sgi/fns.h
+++ b/sys/src/9/sgi/fns.h
@@ -63,8 +63,6 @@ void	wrcount(ulong);
 #define PTR2UINT(p)	((uintptr)(p))
 #define UINT2PTR(i)	((void*)(i))
 
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
 #define KADDR(a)	((void*)((ulong)(a)|KSEG0))
 #define PADDR(a)	((ulong)(a)&~KSEGM)
 
diff --git a/sys/src/9/teg2/fns.h b/sys/src/9/teg2/fns.h
index ce35b7057..262061fa7 100644
--- a/sys/src/9/teg2/fns.h
+++ b/sys/src/9/teg2/fns.h
@@ -194,8 +194,6 @@ void vunmap(void*, usize);
 #define	getpgcolor(a)	0
 #define	kmapinval()
 
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
-
 #define KADDR(pa)	((void*)(KZERO | ((uintptr)(pa) & ~KSEGM)))
 #define PADDR(va)	(PHYSDRAM | ((uintptr)(va) & ~KSEGM))
 
diff --git a/sys/src/9/xen/fns.h b/sys/src/9/xen/fns.h
index 3013d5f4a..f09e56c88 100644
--- a/sys/src/9/xen/fns.h
+++ b/sys/src/9/xen/fns.h
@@ -92,7 +92,6 @@ uint	xchgw(ushort*, uint);
 uint	xchgb(uchar*, uint);
 void	rdrandbuf(void*, ulong);
 
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
 #define KADDR(a)	((void*)((ulong)(a)|KZERO))
 #define PADDR(a)	((ulong)(a)&~KZERO)
 
diff --git a/sys/src/9/zynq/fns.h b/sys/src/9/zynq/fns.h
index 84d1ea05c..97fbc2748 100644
--- a/sys/src/9/zynq/fns.h
+++ b/sys/src/9/zynq/fns.h
@@ -16,7 +16,6 @@ void procsetup(Proc *);
 KMap* kmap(Page *);
 void kunmap(KMap *);
 
-#define	waserror()	(up->nerrlab++, setlabel(&up->errlab[up->nerrlab-1]))
 #define getpgcolor(a) 0
 #define kmapinval()
 #define KADDR(a) kaddr(a)