Changeset 95c4776 in mainline for kernel/arch/sparc64/src/smp

Timestamp:

2010-02-21T19:02:16Z (16 years ago)

Author:

Pavel Rimsky <pavel@…>

Branches:

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

Children:

af56e9b

Parents:

c2efbb4

Message:

Merging SMP (unstable)

Location:

kernel/arch/sparc64/src/smp

Files:

• sun4u/ipi.c (moved) (moved from kernel/arch/sparc64/src/smp/ipi.c ) (2 diffs)
• sun4u/smp.c (moved) (moved from kernel/arch/sparc64/src/smp/smp.c ) (3 diffs)
• sun4v/ipi.c (added)
• sun4v/smp.c (added)

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

@@ -99 +99 @@
         status = asi_u64_read(ASI_INTR_DISPATCH_STATUS, 0);
         if (status & INTR_DISPATCH_STATUS_BUSY)
-                panic("Interrupt Dispatch Status busy bit set.");
+                panic("Interrupt Dispatch Status busy bit set\n");
         
         ASSERT(!(pstate_read() & PSTATE_IE_BIT));
@@ -152 +152 @@
                 break;
         default:
-                panic("Unknown IPI (%d).", ipi);
+                panic("Unknown IPI (%d).\n", ipi);
                 break;
         }

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

@@ -36 +36 @@
 #include <genarch/ofw/ofw_tree.h>
 #include <cpu.h>
-#include <arch/cpu_family.h>
+#include <arch/sun4u/cpu_family.h>
 #include <arch/cpu.h>
 #include <arch.h>
@@ -45 +45 @@
 #include <synch/waitq.h>
 #include <print.h>
-#include <arch/cpu_node.h>
+#include <arch/sun4u/cpu_node.h>
 
 /**
@@ -62 +62 @@
 {
         ofw_tree_node_t *node;
-        size_t cnt = 0;
+        count_t cnt = 0;
         
         if (is_us() || is_us_iii()) {