Changeset 25a76ab8 in mainline for kernel/arch/sparc64/include/arch.h

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

051bc69a

Parents:

6c39a907 (diff), 1317380 (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

@@ -27 +27 @@
  */
 
-/** @addtogroup sparc64 
+/** @addtogroup sparc64
  * @{
  */
 /**
  * @file
- * @brief       Various sparc64-specific macros.
+ * @brief Various sparc64-specific macros.
  */
 
 #ifndef KERN_sparc64_ARCH_H_
 #define KERN_sparc64_ARCH_H_
+
+#include <arch/boot/boot.h>
 
 #if defined (SUN4U)
@@ -44 +46 @@
 #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_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(void);
+extern void arch_pre_main(bootinfo_t *);
 
 #endif /* __ASM__ */
-
 
 #endif