Re: 2.6.12-rc3-mm1

Adrian Bunk
2005-04-30T18:56:19Z

On Sun, May 01, 2005 at 02:08:23AM +0800, Coywolf Qi Hunt wrote:
> On Sun, May 01, 2005 at 01:05:52AM +0800, Coywolf Qi Hunt wrote:
> ...
> > I was trying to fix this too. You are quicker and better than me. In
> > addition, this redundant include should be removed.
>
> s/redundant/duplicate/
>
> OK, since Zwane thinks my patch is "good in that its minimal impact", here it is.
> I've compile tested for SMP and UP.
>
> This removes the compile warning: implicit declaration of function `set_irq_info' and a duplicate include line.
>
> Signed-off-by: Coywolf Qi Hunt <coywolf@lovecn.org>
> ---
>
> diff -pruN 2.6.12-rc3-mm1/arch/i386/kernel/io_apic.c 2.6.12-rc3-mm1-cy2/arch/i386/kernel/io_apic.c
> --- 2.6.12-rc3-mm1/arch/i386/kernel/io_apic.c 2005-04-30 19:15:46.000000000 +0800
> +++ 2.6.12-rc3-mm1-cy2/arch/i386/kernel/io_apic.c 2005-05-01 00:49:27.000000000 +0800
> @@ -32,7 +32,6 @@
> #include <linux/compiler.h>
> #include <linux/acpi.h>
> #include <linux/sysdev.h>
> -#include <linux/irq.h>
> #include <asm/io.h>
> #include <asm/smp.h>
> #include <asm/desc.h>
> diff -pruN 2.6.12-rc3-mm1/include/linux/irq.h 2.6.12-rc3-mm1-cy2/include/linux/irq.h
> --- 2.6.12-rc3-mm1/include/linux/irq.h 2005-04-30 19:16:26.000000000 +0800
> +++ 2.6.12-rc3-mm1-cy2/include/linux/irq.h 2005-05-01 00:51:31.000000000 +0800
> @@ -161,6 +161,7 @@ static inline void set_irq_info(int irq,
> #else
> #define move_irq(x)
> #define move_native_irq(x)
> +extern void set_irq_info(unsigned int irq, cpumask_t mask);
> #endif // CONFIG_GENERIC_PENDING_IRQ
>
> extern int no_irq_affinity;

Is it planned that the empty set_irq_info() function in
kernel/irq/manage.c will ever contain real code?

If not, an empty static inline as in the CONFIG_PCI_MSI=y &&
CONFIG_GENERIC_PENDING_IRQ=y case would generate better code.

cu
Adrian

--

"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed