On Thu, Jan 15, 2015 at 09:22:19PM -0000, Thomas Gleixner wrote:
> No point in having try_to_enable_x2apic() outside of the
> CONFIG_X86_X2APIC section and having inline functions and more ifdefs
> to deal with it. Move the code into the existing ifdef section and
> remove the inline cruft.
> 
> Signed-off-by: Thomas Gleixner <[email protected]>
> ---
>  arch/x86/include/asm/apic.h |   20 ++-----------
>  arch/x86/kernel/apic/apic.c |   65 
> +++++++++++++++++++++-----------------------
>  2 files changed, 35 insertions(+), 50 deletions(-)

...

> +#ifdef CONFIG_X86_IO_APIC
> +     if (!x2apic_enabled() && skip_ioapic_setup) {
> +             pr_info("Skipped enabling intr-remap because of skipping "
> +                     "io-apic setup\n");

Let's correct this message while we're here:

                pr_info("Not enabling interrupt remapping due to skipped 
IO-APIC setup.\n");

> +             return -1;
> +     }
>  #endif
> +     return irq_remapping_enable();
>  }
>  
>  void __init enable_IR_x2apic(void)
> 
> 
> 

-- 
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 [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to