Index: cpu.h
===================================================================
RCS file: /cvs/src/sys/arch/amd64/include/cpu.h,v
retrieving revision 1.97
diff -u -p -r1.97 cpu.h
--- cpu.h	2 Jul 2015 01:33:59 -0000	1.97
+++ cpu.h	23 Aug 2015 10:15:28 -0000
@@ -89,6 +89,10 @@ struct cpu_info {
 	volatile u_int	ci_flags;
 	u_int32_t	ci_ipis;
 
+#ifdef MULTIPROCESSOR
+	struct srp_hazard	ci_srp_hazards[SRP_HAZARD_NUM];
+#endif
+
 	u_int32_t	ci_feature_flags;
 	u_int32_t	ci_feature_eflags;
 	u_int32_t	ci_feature_sefflags;
@@ -130,10 +134,6 @@ struct cpu_info {
 #define CI_DDB_STOPPED		2
 #define CI_DDB_ENTERDDB		3
 #define CI_DDB_INDDB		4
-
-#ifdef MULTIPROCESSOR
-	struct srp_hazard	ci_srp_hazards[SRP_HAZARD_NUM];
-#endif
 
 	struct ksensordev	ci_sensordev;
 	struct ksensor		ci_sensor;