Changes in kernel/arch/sparc64/include/arch.h [4872160:96e0748d] in mainline

File:

• kernel/arch/sparc64/include/arch.h (modified) (2 diffs)

kernel/arch/sparc64/include/arch.h

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64
+/** @addtogroup sparc64 
  * @{
  */
 /**
  * @file
- * @brief Various sparc64-specific macros.
+ * @brief       Various sparc64-specific macros.
  */
 
@@ -38 +38 @@
 #define KERN_sparc64_ARCH_H_
 
-#include <arch/boot/boot.h>
+#define ASI_AIUP                0x10    /** Access to primary context with user privileges. */
+#define ASI_AIUS                0x11    /** Access to secondary context with user privileges. */
+#define ASI_NUCLEUS_QUAD_LDD    0x24    /** ASI for 16-byte atomic loads. */
+#define ASI_DCACHE_TAG          0x47    /** ASI D-Cache Tag. */
+#define ASI_ICBUS_CONFIG                0x4a    /** ASI of the UPA_CONFIG/FIREPLANE_CONFIG register. */
 
-#if defined (SUN4U)
-#include <arch/sun4u/arch.h>
-#elif defined (SUN4V)
-#include <arch/sun4v/arch.h>
-#endif
-
-#define ASI_AIUP  0x10  /** Access to primary context with user privileges. */
-#define ASI_AIUS  0x11  /** Access to secondary context with user privileges. */
-
-#define NWINDOWS  8  /** Number of register window sets. */
+#define NWINDOWS                8       /** Number of register window sets. */
 
 #ifndef __ASM__
 
-extern void arch_pre_main(bootinfo_t *);
+extern void arch_pre_main(void);
 
 #endif /* __ASM__ */