x86/uv: update SCIR driver to use the idle_cpu() function

Impact: cleanup

Change UV heartbeat function to use idle_cpu to determine cpu's
"idleness".  Realign uv_hub definitions.

Signed-of-by: Mike Travis <travis@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Mike Travis
2008-10-27 07:51:20 -07:00
committed by Ingo Molnar
parent 7f1baa063e
commit 69a72a0e93
2 changed files with 15 additions and 15 deletions

View File

@@ -128,19 +128,19 @@ struct uv_scir_s {
* They are kept together in a struct to minimize cache misses. * They are kept together in a struct to minimize cache misses.
*/ */
struct uv_hub_info_s { struct uv_hub_info_s {
unsigned long global_mmr_base; unsigned long global_mmr_base;
unsigned long gpa_mask; unsigned long gpa_mask;
unsigned long gnode_upper; unsigned long gnode_upper;
unsigned long lowmem_remap_top; unsigned long lowmem_remap_top;
unsigned long lowmem_remap_base; unsigned long lowmem_remap_base;
unsigned short pnode; unsigned short pnode;
unsigned short pnode_mask; unsigned short pnode_mask;
unsigned short coherency_domain_number; unsigned short coherency_domain_number;
unsigned short numa_blade_id; unsigned short numa_blade_id;
unsigned char blade_processor_id; unsigned char blade_processor_id;
unsigned char m_val; unsigned char m_val;
unsigned char n_val; unsigned char n_val;
struct uv_scir_s scir; struct uv_scir_s scir;
}; };
DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info); DECLARE_PER_CPU(struct uv_hub_info_s, __uv_hub_info);

View File

@@ -370,8 +370,8 @@ static void uv_heartbeat(unsigned long ignored)
/* flip heartbeat bit */ /* flip heartbeat bit */
bits ^= SCIR_CPU_HEARTBEAT; bits ^= SCIR_CPU_HEARTBEAT;
/* are we the idle thread? */ /* is this cpu idle? */
if (current->pid == 0) if (idle_cpu(raw_smp_processor_id()))
bits &= ~SCIR_CPU_ACTIVITY; bits &= ~SCIR_CPU_ACTIVITY;
else else
bits |= SCIR_CPU_ACTIVITY; bits |= SCIR_CPU_ACTIVITY;