Re: [PATCH] x86_64 irq: reset more to default when clear irq_vectorfor destroy_irq

[David Rientjes]

On Tue, 24 Oct 2006, Yinghai Lu wrote:

> --- linux-2.6/arch/x86_64/kernel/io_apic.c	2006-10-24 13:40:48.000000000 -0700
> +++ linux-2.6.xx/arch/x86_64/kernel/io_apic.c	2006-10-24 14:03:08.000000000 -0700
> @@ -716,6 +716,22 @@
>  	return vector;
>  }
>  
> +static void __clear_irq_vector(int irq)
> +{
> +	int old_vector = -1;
> +	if (irq_vector[irq] > 0)
> +		old_vector = irq_vector[irq];
> +	if (old_vector >= 0) {
> +		cpumask_t old_mask;
> +		int old_cpu;
> +		cpus_and(old_mask, irq_domain[irq], cpu_online_map);
> +		for_each_cpu_mask(old_cpu, old_mask)
> +			per_cpu(vector_irq, old_cpu)[old_vector] = -1;
> +	}
> +	irq_vector[irq] = 0;
> +	irq_domain[irq] = CPU_MASK_NONE;
> +}
> +

The two conditionals don't complement each other; in fact, only one 
conditional is required since the test for old_vector equality to zero 
will never be satisfied.  Also note that irq_vectors are u8 on x86_64 and 
not ints.

	static void __clear_irq_vector(int irq)
	{
		u8 old_vector = irq_vector[irq];
		if (old_vector > 0) {
			cpumask_t old_mask;
			int old_cpu;
			cpus_and(old_mask, irq_domain[irq], cpu_online_map);
			for_each_cpu_mask(old_cpu, old_mask)
				per_cpu(vector_irq, old_cpu)[old_vector] = -1;
		}
		irq_vector[irq] = 0;
		irq_domain[irq] = CPU_MASK_NONE;
	}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/