svn commit: r359423 - head/sys/arm/include

Ian Lepore ian at FreeBSD.org
Sun Mar 29 17:30:20 UTC 2020


Author: ian
Date: Sun Mar 29 17:30:08 2020
New Revision: 359423
URL: https://svnweb.freebsd.org/changeset/base/359423

Log:
  Add a missing suffix that was causing a whole word to get loaded instead
  of the proper 8 or 16 bits when the macro was expanded for those sizes.
  
  Fixes a hang in the armv7 kernel.
  
  Submitted by:	Thomas Skibo
  Pointy hat:	ian@

Modified:
  head/sys/arm/include/atomic-v6.h

Modified: head/sys/arm/include/atomic-v6.h
==============================================================================
--- head/sys/arm/include/atomic-v6.h	Sun Mar 29 15:43:00 2020	(r359422)
+++ head/sys/arm/include/atomic-v6.h	Sun Mar 29 17:30:08 2020	(r359423)
@@ -196,7 +196,7 @@ ATOMIC_ACQ_REL_LONG(clear)
                                                               \
 	__asm __volatile(                                     \
 	    "1: ldrex" SUF "   %[tmp], [%[ptr]]          \n"  \
-	    "   ldr            %[ret], [%[oldv]]         \n"  \
+	    "   ldr" SUF "     %[ret], [%[oldv]]         \n"  \
 	    "   teq            %[tmp], %[ret]            \n"  \
 	    "   ittee          ne                        \n"  \
 	    "   str" SUF "ne   %[tmp], [%[oldv]]         \n"  \


More information about the svn-src-all mailing list