svn commit: r309114 - head/sys/powerpc/include

Justin Hibbits jhibbits at FreeBSD.org
Thu Nov 24 20:31:47 UTC 2016


Author: jhibbits
Date: Thu Nov 24 20:31:46 2016
New Revision: 309114
URL: https://svnweb.freebsd.org/changeset/base/309114

Log:
  Fix the build post-r309017 for MPC85XX/MPC85XXSPE
  
  r309017 removed two fields from struct vmmeter, which is embedded in struct
  pcpu.  This caused the struct size to change, triggering the CTASSERT in
  sys/pcpu.h.  Add the extra 8 bytes back in as padding.

Modified:
  head/sys/powerpc/include/pcpu.h

Modified: head/sys/powerpc/include/pcpu.h
==============================================================================
--- head/sys/powerpc/include/pcpu.h	Thu Nov 24 20:14:43 2016	(r309113)
+++ head/sys/powerpc/include/pcpu.h	Thu Nov 24 20:31:46 2016	(r309114)
@@ -88,7 +88,7 @@ struct pvo_entry;
 	vm_offset_t	pc_qmap_addr;					\
 	uint32_t	*pc_booke_tlb_lock;				\
 	int		pc_tid_next;					\
-	char		__pad[165]
+	char		__pad[173]
 
 /* Definitions for register offsets within the exception tmp save areas */
 #define	CPUSAVE_R27	0		/* where r27 gets saved */


More information about the svn-src-all mailing list