Changeset aa85487 in mainline for kernel/arch/sparc64/include/sun4v/cpu.h

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/include/sun4v/cpu.h (modified) (3 diffs)

kernel/arch/sparc64/include/sun4v/cpu.h

@@ -44 +44 @@
 #ifndef __ASM__
 
+#include <atomic.h>
+#include <synch/spinlock.h>
+
 struct cpu;
 
-/*
 typedef struct {
         uint64_t exec_unit_id;
@@ -55 +57 @@
         SPINLOCK_DECLARE(proposed_nrdy_lock);
 } exec_unit_t;
-*/
 
 typedef struct cpu_arch {
@@ -63 +64 @@
                                              generated when the TICK register
                                              matches this value. */
-        //exec_unit_t *exec_unit;               /**< Physical core. */
-        //unsigned long proposed_nrdy;  /**< Proposed No. of ready threads
-        //                                   so that cores are equally balanced. */
+        exec_unit_t *exec_unit;         /**< Physical core. */
+        unsigned long proposed_nrdy;    /**< Proposed No. of ready threads
+                                             so that cores are equally balanced. */
 } cpu_arch_t;