Re: [PATCH 7/7] x86: print out irq nr for msi/ht -v2

[Ingo Molnar]

* Yinghai Lu <yinghai@xxxxxxxxxx> wrote:

> On Thu, Sep 25, 2008 at 2:12 AM, Ingo Molnar <mingo@xxxxxxx> wrote:
> >
> >> > v2: fix hpet compiling
> >
> > still bad:
> >
> > arch/x86/kernel/hpet.c: In function 'hpet_late_init':
> > arch/x86/kernel/hpet.c:828: error: 'dev' undeclared (first use in this function)
> > arch/x86/kernel/hpet.c:828: error: (Each undeclared identifier is reported only once
> > arch/x86/kernel/hpet.c:828: error: for each function it appears in.)
> >
> > we've got some changes in this area (per cpu hpet).
> >
> 
> looks there is some merge problem.
> 
> Index: linux-2.6/arch/x86/kernel/hpet.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/hpet.c
> +++ linux-2.6/arch/x86/kernel/hpet.c
> @@ -467,6 +467,9 @@ static int hpet_setup_irq(struct hpet_de
>         irq_set_affinity(dev->irq, cpumask_of_cpu(dev->cpu));
>         enable_irq(dev->irq);
> 
> +       printk(KERN_DEBUG "hpet: %s is using irq %#x aka %d for MSI\n",
> +                        dev->name, dev->irq, dev->irq);
> +
>         return 0;
>  }
> 
> the change should be in hpet_setup_irq instead of hpet_late_init
> 
> the patch can be applied to tip/master cleanly.

ok, figure it out, the problem was that your change depended on 
tip/timers/hpet-percpu.

sorted it out.

	Ingo
--
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/