On Thu, Jan 02, 2014 at 04:05:56PM -0800, Yinghai Lu wrote:
> Address compiling problem that Fengguang report.
Does this fix a problem that's already in the upstream tree?
If it merely fixes a problem that was added somewhere in your patches,
why don't you fold this fix into the patch that added the problem?
If you included more details, like the exact problem report, I could
probably have figured this out myself.
Bjorn
> Reported-by: Fengguang Wu <wfg@xxxxxxxxxxxxxxx>
> Signed-off-by: Yinghai Lu <yinghai@xxxxxxxxxx>
> Cc: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
> Cc: Jiang Liu <jiang.liu@xxxxxxxxxx>
> ---
> arch/x86/include/asm/mpspec.h | 18 +++++++++++++++++-
> 1 file changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h
> index b98665f..e9d850e 100644
> --- a/arch/x86/include/asm/mpspec.h
> +++ b/arch/x86/include/asm/mpspec.h
> @@ -95,10 +95,26 @@ static inline void early_reserve_e820_mpc_new(void) { }
> #endif
>
> int generic_processor_info(int apicid, int version);
> -#ifdef CONFIG_ACPI
> +#ifdef CONFIG_X86_IO_APIC
> int __mp_register_ioapic(int id, u32 address, u32 gsi_base, bool hot);
> int mp_unregister_ioapic(u32 gsi_base);
> extern void mp_register_ioapic(int id, u32 address, u32 gsi_base);
> +#else
> +static inline int __mp_register_ioapic(int id, u32 address, u32 gsi_base,
> + bool hot)
> +{
> + return 0;
> +}
> +static inline int mp_unregister_ioapic(u32 gsi_base)
> +{
> + return 0;
> +}
> +static inline void mp_register_ioapic(int id, u32 address, u32 gsi_base)
> +{
> +}
> +#endif
> +
> +#ifdef CONFIG_ACPI
> extern void mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger,
> u32 gsi);
> extern void mp_config_acpi_legacy_irqs(void);
> --
> 1.8.4
>
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
