Browse Source

cpumask: Cleanup more uses of CPU_MASK and NODE_MASK

 *  Replace usages of CPU_MASK_NONE, CPU_MASK_ALL, NODE_MASK_NONE,
    NODE_MASK_ALL to reduce stack requirements for large NR_CPUS
    and MAXNODES counts.

 *  In some cases, the cpumask variable was initialized but then overwritten
    with another value.  This is the case for changes like this:

    -       cpumask_t oldmask = CPU_MASK_ALL;
    +       cpumask_t oldmask;

Signed-off-by: Mike Travis <travis@sgi.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Mike Travis 17 years ago
parent
commit
d366f8cbc1
3 changed files with 4 additions and 3 deletions
  1. 1 1
      arch/x86/kernel/io_apic_64.c
  2. 1 1
      kernel/irq/chip.c
  3. 2 1
      mm/allocpercpu.c

+ 1 - 1
arch/x86/kernel/io_apic_64.c

@@ -785,7 +785,7 @@ static void __clear_irq_vector(int irq)
 		per_cpu(vector_irq, cpu)[vector] = -1;
 		per_cpu(vector_irq, cpu)[vector] = -1;
 
 
 	cfg->vector = 0;
 	cfg->vector = 0;
-	cfg->domain = CPU_MASK_NONE;
+	cpus_clear(cfg->domain);
 }
 }
 
 
 void __setup_vector_irq(int cpu)
 void __setup_vector_irq(int cpu)

+ 1 - 1
kernel/irq/chip.c

@@ -47,7 +47,7 @@ void dynamic_irq_init(unsigned int irq)
 	desc->irq_count = 0;
 	desc->irq_count = 0;
 	desc->irqs_unhandled = 0;
 	desc->irqs_unhandled = 0;
 #ifdef CONFIG_SMP
 #ifdef CONFIG_SMP
-	desc->affinity = CPU_MASK_ALL;
+	cpus_setall(desc->affinity);
 #endif
 #endif
 	spin_unlock_irqrestore(&desc->lock, flags);
 	spin_unlock_irqrestore(&desc->lock, flags);
 }
 }

+ 2 - 1
mm/allocpercpu.c

@@ -82,9 +82,10 @@ EXPORT_SYMBOL_GPL(percpu_populate);
 int __percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,
 int __percpu_populate_mask(void *__pdata, size_t size, gfp_t gfp,
 			   cpumask_t *mask)
 			   cpumask_t *mask)
 {
 {
-	cpumask_t populated = CPU_MASK_NONE;
+	cpumask_t populated;
 	int cpu;
 	int cpu;
 
 
+	cpus_clear(populated);
 	for_each_cpu_mask(cpu, *mask)
 	for_each_cpu_mask(cpu, *mask)
 		if (unlikely(!percpu_populate(__pdata, size, gfp, cpu))) {
 		if (unlikely(!percpu_populate(__pdata, size, gfp, cpu))) {
 			__percpu_depopulate_mask(__pdata, &populated);
 			__percpu_depopulate_mask(__pdata, &populated);