Re: [PATCH 0/9] -tip/apic merging one more series

[Ingo Molnar]

* Cyrill Gorcunov <gorcunov@xxxxxxxxx> wrote:

> On Mon, Aug 18, 2008 at 1:53 AM, Yinghai Lu <yhlu.kernel@xxxxxxxxx> wrote:
> > please check if you need { } otherwise you broke 64 bit
> >
> >
> > static int lapic_resume(struct sys_device *dev)
> > {
> >        unsigned int l, h;
> >        unsigned long flags;
> >        int maxlvt;
> >
> >        if (!apic_pm_state.active)
> >                return 0;
> >
> >        maxlvt = lapic_get_maxlvt();
> >
> >        local_irq_save(flags);
> >
> > #ifdef CONFIG_X86_64
> >        if (x2apic)
> >                enable_x2apic();
> >        else
> > #endif
> >                /*
> >                 * Make sure the APICBASE points to the right address
> >                 *
> >                 * FIXME! This will be wrong if we ever support suspend on
> >                 * SMP! We'll need to do this as part of the CPU restore!
> >                 */
> >                rdmsr(MSR_IA32_APICBASE, l, h);
> >                l &= ~MSR_IA32_APICBASE_BASE;
> >                l |= MSR_IA32_APICBASE_ENABLE | mp_lapic_addr;
> >                wrmsr(MSR_IA32_APICBASE, l, h);
> >
> >
> > YH
> >
> 
> Oh...indeed. Thanks Yinghai! - will fix it today evening.
> Ingo drop this patch please (if it was applied).

hm, none of these patches has lapic_resume mentioned and current 
tip/master's version doesnt seem broken so there's nothing to drop.

plus 1/9 doesnt apply to tip/master. (nor tip/x86/apic, nor -git)

I'll wait for this to be sorted 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/