The patch titled cleanup: make disable_acpi() valid w/o CONFIG_ACPI has been removed from the -mm tree. Its filename was cleanup-make-disable_acpi-valid-w-o-config_acpi.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: cleanup: make disable_acpi() valid w/o CONFIG_ACPI From: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Len Brown <lenb@xxxxxxxxxx> said: > Okay, but better to use disable_acpi() > indeed, since this would be the first code not already inside CONFIG_ACPI > to invoke disable_acpi(), we could define the inline as empty and you could > then scratch the #ifdef too. Signed-off-by: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- include/asm-i386/acpi.h | 1 + 1 file changed, 1 insertion(+) diff -puN include/asm-i386/acpi.h~cleanup-make-disable_acpi-valid-w-o-config_acpi include/asm-i386/acpi.h --- a/include/asm-i386/acpi.h~cleanup-make-disable_acpi-valid-w-o-config_acpi +++ a/include/asm-i386/acpi.h @@ -127,6 +127,7 @@ extern int acpi_irq_balance_set(char *st #define acpi_ioapic 0 static inline void acpi_noirq_set(void) { } static inline void acpi_disable_pci(void) { } +static inline void disable_acpi(void) { } #endif /* !CONFIG_ACPI */ _ Patches currently in -mm which might be from rusty@xxxxxxxxxxxxxxx are origin.patch git-acpi.patch cleanup-paravirt-unhandled-fallthrough.patch cleanup-initialize-esp0-properly-all-the-time.patch cleanup-make-hvc_consolec-compile-on-non-powerpc.patch cleanup-move-mce_disabled-to-asm-mceh.patch cleanup-rename-cpu_gdt_descr-and-remove-extern.patch cleanup-remove-extern-declaration-from.patch lguest-preparation-export_symbol_gpl-5-functions.patch lguest-preparation-expose-futex-infrastructure.patch lguest-kconfig-and-headers.patch lguest-the-host-code-lgko.patch lguest-guest-code.patch lguest-makefile.patch lguest-trivial-guest-network-driver.patch lguest-trivial-guest-network-driver-fix.patch lguest-trivial-guest-console-driver.patch lguest-trivial-guest-block-driver.patch lguest-documentatation-and-example-launcher.patch vmi-versus-hrtimers.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html