On Mon, Aug 25, 2008 at 10:42 AM, Yinghai Lu <yhlu.kernel@xxxxxxxxx> wrote:
> On Mon, Aug 25, 2008 at 2:50 AM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>> Hi Ingo,
>>
>> Today's linux-next build (powerpc ppc64_defconfig) failed like this:
>>
>> arch/powerpc/platforms/cell/interrupt.c: In function 'handle_iic_irq':
>> arch/powerpc/platforms/cell/interrupt.c:257: error: 'struct kernel_stat' has no member named 'irqs'
>> arch/powerpc/kernel/irq.c: In function 'show_interrupts':
>> arch/powerpc/kernel/irq.c:193: error: 'struct kernel_stat' has no member named 'irqs'
>>
>> Presumably introduced by commit fb6dc57946f9ebfeac546dd0698d9f065c191668
>> ("x86: move kstat_irqs from kstat to irq_desc").
>>
>> Looks like there is more work here ...
>>
>> Its late, so I just dropped the whole tree for today. We can try again
>> tomorrow.
>
> seems there is some merge problem...
> please check.
>
> diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h
> index f106167..3cd7389 100644
> --- a/include/linux/kernel_stat.h
> +++ b/include/linux/kernel_stat.h
> @@ -28,7 +28,7 @@ struct cpu_usage_stat {
>
> struct kernel_stat {
> struct cpu_usage_stat cpustat;
> -#ifndef CONFIG_GENERIC_HARDIRQS
> +#ifndef CONFIG_HAVE_SPARSE_IRQ
> unsigned int irqs[NR_IRQS];
> #endif
> };
more than that, will double check that.
YH
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
