I vote #2 -- remove the #ifdefs.All of these routines are both small and __init,and the only build that would notice the extra bytes in .textis the x86 IOAPIC ACPI=n build, which is uncommon todayand becoming more uncommon over time.

The SFI patch series doesn't actually depend on these routines,the IO-APIC patch depends on them. So this changeshould be in the IO-APIC series.