On Fri, Jan 3, 2014 at 1:24 PM, Bjorn Helgaas wrote: > 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. please check updated changelog: --- Subject: [PATCH] x86: Move declaration for mp_register_ioapic() Preparing patch for ioapic hotplug: PCI, x86, ACPI: Link acpi ioapic register to ioapic as it adds calling in arch/x86/kernel/acpi/boot.c::acpi_register_ioapic() acpi_unregister_ioapic() Address compiling problem when CONFIG_ACPI is defined CONFIG_X86_IOAPIC is not defined. Change condition to X86_IO_APIC instead of ACPI. -v2: update changelog requested by Bjorn. -----