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

Timestamp:

2010-03-07T15:11:56Z (15 years ago)

Author:

Lukas Mejdrech <lukasmejdrech@…>

Branches:

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

Children:

aadf01e

Parents:

2e99277 (diff), 137691a (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, revision 308

File:

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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2009 Pavel Rimsky
  * All rights reserved.
  *
@@ -40 +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
@@ -51 +51 @@
         __hypercall_fast_ret1(0, 0, 0, 0, 0, CPU_MYID, &myid);
 
-        //MH
-        //CPU->arch.id = myid;
+        CPU->arch.id = myid;
 
         md_node_t node = md_get_root();
@@ -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);
 }