Index: stable/10/sys/arm/mv/std-pj4b.mv
===================================================================
--- stable/10/sys/arm/mv/std-pj4b.mv	(revision 294689)
+++ stable/10/sys/arm/mv/std-pj4b.mv	(revision 294690)
@@ -1,8 +1,12 @@
 # $FreeBSD$
 
 files		"../mv/files.mv"
 cpu		CPU_MV_PJ4B
 machine 	arm	armv6
 makeoptions	CONF_CFLAGS="-march=armv7a -Wa,-march=armv7a"
 
-options		VM_MAXUSER_ADDRESS="(KERNBASE-(1024*1024*1024))"
+# This was originally defined as "(KERNBASE-(1024*1024*1024))" but that
+# (in opt_global.h) clashed with the value emitted by genassym which
+# reduces the original macro text to its numeric value.  The only way
+# to avoid that is to define it here as the numeric value genassym emits.
+options		VM_MAXUSER_ADDRESS="0x80000000"
Index: stable/10
===================================================================
--- stable/10	(revision 294689)
+++ stable/10	(revision 294690)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r289477