Changeset bfd7aac in mainline for kernel/arch/sparc64/include/arch.h

Timestamp:

2010-02-17T19:19:08Z (14 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1e2e0c1e

Parents:

01a9ef5 (diff), b8da2a3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline changes.

File:

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

kernel/arch/sparc64/include/arch.h

@@ -38 +38 @@
 #define KERN_sparc64_ARCH_H_
 
+#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 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. */
 
 #define NWINDOWS                8       /** Number of register window sets. */
@@ -52 +55 @@
 #endif /* __ASM__ */
 
+
 #endif