Changeset b50b5af2 in mainline for boot/arch/sparc64/loader/register.h

Timestamp:

2009-08-22T10:48:00Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

04803bf

Parents:

1ea99cc (diff), a71c158 (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:

• boot/arch/sparc64/loader/register.h (modified) (1 diff)

boot/arch/sparc64/loader/register.h

@@ -30 +30 @@
 #define BOOT_sparc64_REGISTER_H_
 
-#define PSTATE_IE_BIT   2
-#define PSTATE_PRIV_BIT 4
-#define PSTATE_AM_BIT   8
+#define PSTATE_IE_BIT    2
+#define PSTATE_PRIV_BIT  4
+#define PSTATE_AM_BIT    8
 
-#define ASI_ICBUS_CONFIG                0x4a
-#define ICBUS_CONFIG_MID_SHIFT          17
+#define ASI_ICBUS_CONFIG        0x4a
+#define ICBUS_CONFIG_MID_SHIFT  17
 
 #endif