diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h
index d51da6d59fe4..e791a70f2cde 100644
--- a/sys/i386/include/specialreg.h
+++ b/sys/i386/include/specialreg.h
@@ -426,22 +426,22 @@
 #define	MCG_STATUS_RIPV		0x00000001
 #define	MCG_STATUS_EIPV		0x00000002
 #define	MCG_STATUS_MCIP		0x00000004
-#define	MCG_CTL_ENABLE		0xffffffffffffffffUL
-#define	MCG_CTL_DISABLE		0x0000000000000000UL
+#define	MCG_CTL_ENABLE		0xffffffffffffffffULL
+#define	MCG_CTL_DISABLE		0x0000000000000000ULL
 #define	MSR_MC_CTL(x)		(MSR_MC0_CTL + (x) * 4)
 #define	MSR_MC_STATUS(x)	(MSR_MC0_STATUS + (x) * 4)
 #define	MSR_MC_ADDR(x)		(MSR_MC0_ADDR + (x) * 4)
 #define	MSR_MC_MISC(x)		(MSR_MC0_MISC + (x) * 4)
-#define	MC_STATUS_MCA_ERROR	0x000000000000ffffUL
-#define	MC_STATUS_MODEL_ERROR	0x00000000ffff0000UL
-#define	MC_STATUS_OTHER_INFO	0x01ffffff00000000UL
-#define	MC_STATUS_PCC		0x0200000000000000UL
-#define	MC_STATUS_ADDRV		0x0400000000000000UL
-#define	MC_STATUS_MISCV		0x0800000000000000UL
-#define	MC_STATUS_EN		0x1000000000000000UL
-#define	MC_STATUS_UC		0x2000000000000000UL
-#define	MC_STATUS_OVER		0x4000000000000000UL
-#define	MC_STATUS_VAL		0x8000000000000000UL
+#define	MC_STATUS_MCA_ERROR	0x000000000000ffffULL
+#define	MC_STATUS_MODEL_ERROR	0x00000000ffff0000ULL
+#define	MC_STATUS_OTHER_INFO	0x01ffffff00000000ULL
+#define	MC_STATUS_PCC		0x0200000000000000ULL
+#define	MC_STATUS_ADDRV		0x0400000000000000ULL
+#define	MC_STATUS_MISCV		0x0800000000000000ULL
+#define	MC_STATUS_EN		0x1000000000000000ULL
+#define	MC_STATUS_UC		0x2000000000000000ULL
+#define	MC_STATUS_OVER		0x4000000000000000ULL
+#define	MC_STATUS_VAL		0x8000000000000000ULL
 
 /*
  * The following four 3-byte registers control the non-cacheable regions.