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

Timestamp:

2010-02-21T19:02:16Z (14 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)

File:

• kernel/arch/sparc64/include/sun4v/cpu.h (modified) (3 diffs)

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

@@ -46 +46 @@
 struct cpu;
 
-/*
 typedef struct {
         uint64_t exec_unit_id;
@@ -52 +51 @@
         uint64_t cpuids[MAX_CORE_STRANDS];
         struct cpu *cpus[MAX_CORE_STRANDS];
+        //cpu_t *cpus[MAX_CORE_STRANDS];
         atomic_t nrdy;
         SPINLOCK_DECLARE(proposed_nrdy_lock);
 } exec_unit_t;
-*/
 
 typedef struct cpu_arch {
@@ -63 +62 @@
                                              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;