On Thu, Jan 15, 2015 at 09:22:16PM -0000, Thomas Gleixner wrote:
> If x2apic_preenabled is not enabled, then disable_x2apic() is not
> called from various places which results in x2apic_disabled not being
> set. So other code pathes can happily reenable the x2apic.
>
> Signed-off-by: Thomas Gleixner <t...@linutronix.de>
> ---
> arch/x86/kernel/apic/apic.c | 14 +++++---------
> 1 file changed, 5 insertions(+), 9 deletions(-)
>
> Index: tip/arch/x86/kernel/apic/apic.c
> ===================================================================
> --- tip.orig/arch/x86/kernel/apic/apic.c
> +++ tip/arch/x86/kernel/apic/apic.c
> @@ -1479,8 +1479,6 @@ static bool nox2apic __initdata;
>
> #ifdef CONFIG_X86_X2APIC
> int x2apic_mode;
> -/* x2apic enabled before OS handover */
> -static int x2apic_preenabled;
> static int x2apic_disabled;
> static int __init setup_nox2apic(char *str)
> {
> @@ -1535,18 +1533,19 @@ static __init void disable_x2apic(void)
> setup_clear_cpu_cap(X86_FEATURE_X2APIC);
> }
>
> - x2apic_disabled = 1;
> x2apic_mode = 0;
Should we move out that write to x2apic_mode too?
>
> register_lapic_address(mp_lapic_addr);
> }
> +
> + x2apic_disabled = 1;
i.e., here?
Just in case.
--
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
