Index: sys/cddl/dev/dtrace/i386/dtrace_isa.c
===================================================================
--- sys/cddl/dev/dtrace/i386/dtrace_isa.c
+++ sys/cddl/dev/dtrace/i386/dtrace_isa.c
@@ -47,7 +47,7 @@
 extern uintptr_t kernbase;
 uintptr_t kernelbase = (uintptr_t) &kernbase;
 
-#define INKERNEL(va) (((vm_offset_t)(va)) >= USRSTACK && \
+#define INKERNEL(va) (((vm_offset_t)(va)) >= VM_MAXUSER_ADDRESS && \
 	 ((vm_offset_t)(va)) < VM_MAX_KERNEL_ADDRESS)
 
 uint8_t dtrace_fuword8_nocheck(void *);
Index: sys/i386/include/pmc_mdep.h
===================================================================
--- sys/i386/include/pmc_mdep.h
+++ sys/i386/include/pmc_mdep.h
@@ -138,7 +138,7 @@
 
 #define	PMC_IN_KERNEL_STACK(S,START,END)		\
 	((S) >= (START) && (S) < (END))
-#define	PMC_IN_KERNEL(va) (((va) >= USRSTACK) &&	\
+#define	PMC_IN_KERNEL(va) (((va) >= VM_MAXUSER_ADDRESS) &&	\
 	((va) < VM_MAX_KERNEL_ADDRESS))
 
 #define	PMC_IN_USERSPACE(va) ((va) <= VM_MAXUSER_ADDRESS)
Index: sys/i386/include/stack.h
===================================================================
--- sys/i386/include/stack.h
+++ sys/i386/include/stack.h
@@ -32,7 +32,7 @@
 /*
  * Stack trace.
  */
-#define INKERNEL(va)	(((vm_offset_t)(va)) >= USRSTACK && \
+#define INKERNEL(va)	(((vm_offset_t)(va)) >= VM_MAXUSER_ADDRESS && \
 	    ((vm_offset_t)(va)) < VM_MAX_KERNEL_ADDRESS)
 
 struct i386_frame {