Changeset 72bf0d2 in mainline for kernel/arch/sparc64/src/cpu/sun4v/cpu.c

Timestamp:

2010-02-22T21:24:19Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

850987d

Parents:

61001a9 (diff), f8f7dba (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 from lp:~rimskyp/helenos/sparc.
Fix non-SMP build on sun4v.
Minor cleanup.

File:

• kernel/arch/sparc64/src/cpu/sun4v/cpu.c (modified) (3 diffs)

kernel/arch/sparc64/src/cpu/sun4v/cpu.c

@@ -41 +41 @@
 #include <arch/sun4v/md.h>
 #include <arch/sun4v/hypercall.h>
-
-//#include <arch/trap/sun4v/interrupt.h>
+#include <arch/trap/sun4v/interrupt.h>
 
 /** Perform sparc64 specific initialization of the processor structure for the
@@ -74 +73 @@
                 
         tick_init();
-        //MH - uncomment later
-        //sun4v_ipi_init();
+
+        sun4v_ipi_init();
 }
 
@@ -96 +95 @@
 {
         printf("cpu%d: Niagara (%d MHz)\n", m->id,
-                m->arch.clock_frequency / 1000000);
+            m->arch.clock_frequency / 1000000);
 }