Changeset 371bd7d in mainline for kernel/arch/sparc64/src/smp/sun4u/smp.c

Timestamp:

2010-03-27T09:22:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

36a75a2

Parents:

cd82bb1 (diff), eaf22d4 (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/src/smp/sun4u/smp.c (moved) (moved from kernel/arch/sparc64/src/smp/smp.c ) (2 diffs)

kernel/arch/sparc64/src/smp/sun4u/smp.c

@@ -41 +41 @@
 #include <config.h>
 #include <macros.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <synch/synch.h>
 #include <synch/waitq.h>
@@ -62 +62 @@
 {
         ofw_tree_node_t *node;
-        size_t cnt = 0;
+        unsigned int cnt = 0;
         
         if (is_us() || is_us_iii()) {