From 27efbf647d0328612f1c44a888957c1f15f2b67c Mon Sep 17 00:00:00 2001
From: marius <marius@FreeBSD.org>
Date: Sat, 20 Feb 2010 23:24:19 +0000
Subject: Some machines can not only consist of CPUs running at different
 speeds but also of different types, f.e. Sun Fire V890 can be equipped with a
 mix of UltraSPARC IV and IV+ CPUs, requiring different MMU initialization and
 different workarounds for model specific errata. Therefore move the CPU
 implementation number from a global variable to the per-CPU data. Functions
 which are called before the latter is available are passed the implementation
 number as a parameter now.

---
 sys/sparc64/include/ver.h | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

(limited to 'sys/sparc64/include/ver.h')

diff --git a/sys/sparc64/include/ver.h b/sys/sparc64/include/ver.h
index 0fb7933..ad6841b 100644
--- a/sys/sparc64/include/ver.h
+++ b/sys/sparc64/include/ver.h
@@ -43,24 +43,28 @@
 
 #ifndef LOCORE
 
-#define	VER_MANUF_MASK		(((1L<<VER_MANUF_SIZE)-1)<<VER_MANUF_SHIFT)
-#define	VER_IMPL_MASK		(((1L<<VER_IMPL_SIZE)-1)<<VER_IMPL_SHIFT)
-#define	VER_MASK_MASK		(((1L<<VER_MASK_SIZE)-1)<<VER_MASK_SHIFT)
-#define	VER_MAXTL_MASK		(((1L<<VER_MAXTL_SIZE)-1)<<VER_MAXTL_SHIFT)
-#define	VER_MAXWIN_MASK		(((1L<<VER_MAXWIN_SIZE)-1)<<VER_MAXWIN_SHIFT)
+#define	VER_MANUF_MASK							\
+	(((1UL << VER_MANUF_SIZE) - 1) << VER_MANUF_SHIFT)
+#define	VER_IMPL_MASK							\
+	(((1UL << VER_IMPL_SIZE) - 1) << VER_IMPL_SHIFT)
+#define	VER_MASK_MASK							\
+	(((1UL << VER_MASK_SIZE) - 1) << VER_MASK_SHIFT)
+#define	VER_MAXTL_MASK							\
+	(((1UL << VER_MAXTL_SIZE) - 1) << VER_MAXTL_SHIFT)
+#define	VER_MAXWIN_MASK							\
+	(((1UL << VER_MAXWIN_SIZE) - 1) << VER_MAXWIN_SHIFT)
 
-#define	VER_MANUF(ver) \
+#define	VER_MANUF(ver)							\
 	(((ver) & VER_MANUF_MASK) >> VER_MANUF_SHIFT)
-#define	VER_IMPL(ver) \
+#define	VER_IMPL(ver)							\
 	(((ver) & VER_IMPL_MASK) >> VER_IMPL_SHIFT)
-#define	VER_MASK(ver) \
+#define	VER_MASK(ver)							\
 	(((ver) & VER_MASK_MASK) >> VER_MASK_SHIFT)
-#define	VER_MAXTL(ver) \
+#define	VER_MAXTL(ver)							\
 	(((ver) & VER_MAXTL_MASK) >> VER_MAXTL_SHIFT)
-#define	VER_MAXWIN(ver) \
+#define	VER_MAXWIN(ver)							\
 	(((ver) & VER_MAXWIN_MASK) >> VER_MAXWIN_SHIFT)
 
-extern int cpu_impl;
 extern char sparc64_model[];
 
 #endif /* !LOCORE */
-- 
cgit v1.1