Index: /branches/arm/lisp-kernel/arm-macros.s
===================================================================
--- /branches/arm/lisp-kernel/arm-macros.s	(revision 13843)
+++ /branches/arm/lisp-kernel/arm-macros.s	(revision 13844)
@@ -145,6 +145,6 @@
 	/* "Length" is fixnum element count */
 define(`header_length',`
-        __(mov $1,#-1<<fixnumshift)
-        __(and $1,$1,$2,lsr #num_subtag_bits-fixnumshift)
+        __(bic $1,$2,#subtag_mask)
+        __(mov $1,$1,lsr #num_subtag_bits-fixnumshift)
         ')
 
