[PATCH] x86: remove noop cpus_and() with CPU_MASK_ALL.

[PATCH] x86: remove noop cpus_and() with CPU_MASK_ALL.

[Rusty Russell]

I'm not sure what this is supposed to do.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff -r 52e0cb95ef98 arch/x86/kernel/io_apic_32.c
--- a/arch/x86/kernel/io_apic_32.c	Sat Sep 06 15:18:06 2008 +1000
+++ b/arch/x86/kernel/io_apic_32.c	Thu Sep 18 14:30:01 2008 +1000
@@ -346,9 +346,7 @@ static void set_ioapic_affinity_irq(unsi
 	if (cpus_empty(tmp))
 		tmp = TARGET_CPUS;
 
-	cpus_and(cpumask, tmp, CPU_MASK_ALL);
-
-	apicid_value = cpu_mask_to_apicid(cpumask);
+	apicid_value = cpu_mask_to_apicid(tmp);
 	/* Prepare to do the io_apic_write */
 	apicid_value = apicid_value << 24;
 	spin_lock_irqsave(&ioapic_lock, flags);
@@ -361,7 +359,7 @@ static void set_ioapic_affinity_irq(unsi
 			break;
 		entry = irq_2_pin + entry->next;
 	}
-	irq_desc[irq].affinity = cpumask;
+	irq_desc[irq].affinity = tmp;
 	spin_unlock_irqrestore(&ioapic_lock, flags);
 }
 
@@ -2613,12 +2611,10 @@ static void set_ht_irq_affinity(unsigned
 	if (cpus_empty(tmp))
 		tmp = TARGET_CPUS;
 
-	cpus_and(mask, tmp, CPU_MASK_ALL);
-
-	dest = cpu_mask_to_apicid(mask);
+	dest = cpu_mask_to_apicid(tmp);
 
 	target_ht_irq(irq, dest);
-	irq_desc[irq].affinity = mask;
+	irq_desc[irq].affinity = tmp;
 }
 #endif
 

Re: [PATCH] x86: remove noop cpus_and() with CPU_MASK_ALL.

[Yinghai Lu]

On Tue, Sep 30, 2008 at 3:59 PM, Rusty Russell <rusty@rustcorp.com.au> wrote:
> I'm not sure what this is supposed to do.
>
> Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
>
> diff -r 52e0cb95ef98 arch/x86/kernel/io_apic_32.c
> --- a/arch/x86/kernel/io_apic_32.c      Sat Sep 06 15:18:06 2008 +1000
> +++ b/arch/x86/kernel/io_apic_32.c      Thu Sep 18 14:30:01 2008 +1000

can you check tip/master?

http://people.redhat.com/mingo/tip.git/readme.txt

we merged io_apic_32.c and io_apic_64.c to io_apic.c for 2.6.28
also make 32bit to use per-cpu vector....

YH