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

Timestamp:

2010-02-20T22:23:42Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

61001a9, af56e9b

Parents:

aa30c7f (diff), c2efbb4 (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.

File:

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

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

@@ -1 +1 @@
 /*
  * Copyright (c) 2005 Jakub Jermar
+ * Copyright (c) 2009 Pavel Rimsky
  * All rights reserved.
  *
@@ -51 +52 @@
         __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();