Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xen: convert to cpumask_var_t and new cpumask primitives.

Browse source 
Simple change, and eventual space saving when NR_CPUS >> nr_cpu_ids.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: Mike Travis <travis@sgi.com>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
This commit is contained in:
Mike Travis 2008-12-16 17:33:57 -08:00
parent 22f65d31b2
commit b78936e14e
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/x86/xen/smp.c
View file

@ -33,7 +33,7 @@
#include "xen-ops.h" #include "xen-ops.h"
#include "mmu.h" #include "mmu.h"
cpumask_t xen_cpu_initialized_map; cpumask_var_t xen_cpu_initialized_map;
static DEFINE_PER_CPU(int, resched_irq); static DEFINE_PER_CPU(int, resched_irq);
static DEFINE_PER_CPU(int, callfunc_irq); static DEFINE_PER_CPU(int, callfunc_irq);
@ -192,7 +192,10 @@ static void __init xen_smp_prepare_cpus(unsigned int max_cpus)
if (xen_smp_intr_init(0)) if (xen_smp_intr_init(0))
BUG(); BUG();
xen_cpu_initialized_map = cpumask_of_cpu(0); if (!alloc_cpumask_var(&xen_cpu_initialized_map, GFP_KERNEL))
panic("could not allocate xen_cpu_initialized_map\n");
cpumask_copy(xen_cpu_initialized_map, cpumask_of(0));
/* Restrict the possible_map according to max_cpus. */ /* Restrict the possible_map according to max_cpus. */
while ((num_possible_cpus() > 1) && (num_possible_cpus() > max_cpus)) { while ((num_possible_cpus() > 1) && (num_possible_cpus() > max_cpus)) {
@ -221,7 +224,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle)
struct vcpu_guest_context *ctxt; struct vcpu_guest_context *ctxt;
struct desc_struct *gdt; struct desc_struct *gdt;
if (cpu_test_and_set(cpu, xen_cpu_initialized_map)) if (cpumask_test_and_set_cpu(cpu, xen_cpu_initialized_map))
return 0; return 0;
ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL); ctxt = kzalloc(sizeof(*ctxt), GFP_KERNEL);

3
arch/x86/xen/suspend.c
View file

@ -35,7 +35,8 @@ void xen_post_suspend(int suspend_cancelled)
pfn_to_mfn(xen_start_info->console.domU.mfn); pfn_to_mfn(xen_start_info->console.domU.mfn);
} else { } else {
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
xen_cpu_initialized_map = cpu_online_map; BUG_ON(xen_cpu_initialized_map == NULL);
cpumask_copy(xen_cpu_initialized_map, cpu_online_mask);
#endif #endif
xen_vcpu_restore(); xen_vcpu_restore();
} }

2
arch/x86/xen/xen-ops.h
View file

@ -58,7 +58,7 @@ void __init xen_init_spinlocks(void);
__cpuinit void xen_init_lock_cpu(int cpu); __cpuinit void xen_init_lock_cpu(int cpu);
void xen_uninit_lock_cpu(int cpu); void xen_uninit_lock_cpu(int cpu);
extern cpumask_t xen_cpu_initialized_map; extern cpumask_var_t xen_cpu_initialized_map;
#else #else
static inline void xen_smp_init(void) {} static inline void xen_smp_init(void) {}
#endif #endif