The patch titled paravirtualization: Allow disabling legacy power management modes with paravirt kernels has been removed from the -mm tree. Its filename was paravirtualization-allow-disabling-legacy-power.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: paravirtualization: Allow disabling legacy power management modes with paravirt kernels From: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Two legacy power management modes are much easier to just explicitly disable when running in paravirtualized mode - neither APM nor PnP is still relevant. The status of ACPI is still debatable, and noacpi is still a common enough boot parameter that it is not necessary to explicitly disable ACPI. Signed-off-by: Zachary Amsden <zach@xxxxxxxxxx> Signed-off-by: Chris Wright <chrisw@xxxxxxxxxxxx> Cc: Rusty Russell <rusty@xxxxxxxxxxxxxxx> Cc: Jeremy Fitzhardinge <jeremy@xxxxxxxx> Cc: Andi Kleen <ak@xxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- arch/i386/kernel/apm.c | 3 ++- drivers/pnp/pnpbios/core.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff -puN arch/i386/kernel/apm.c~paravirtualization-allow-disabling-legacy-power arch/i386/kernel/apm.c --- a/arch/i386/kernel/apm.c~paravirtualization-allow-disabling-legacy-power +++ a/arch/i386/kernel/apm.c @@ -231,6 +231,7 @@ #include <asm/uaccess.h> #include <asm/desc.h> #include <asm/i8253.h> +#include <asm/paravirt.h> #include "io_ports.h" @@ -2235,7 +2236,7 @@ static int __init apm_init(void) dmi_check_system(apm_dmi_table); - if (apm_info.bios.version == 0) { + if (apm_info.bios.version == 0 || paravirt_enabled()) { printk(KERN_INFO "apm: BIOS not found.\n"); return -ENODEV; } diff -puN drivers/pnp/pnpbios/core.c~paravirtualization-allow-disabling-legacy-power drivers/pnp/pnpbios/core.c --- a/drivers/pnp/pnpbios/core.c~paravirtualization-allow-disabling-legacy-power +++ a/drivers/pnp/pnpbios/core.c @@ -530,7 +530,8 @@ static int __init pnpbios_init(void) if (check_legacy_ioport(PNPBIOS_BASE)) return -ENODEV; #endif - if (pnpbios_disabled || dmi_check_system(pnpbios_dmi_table)) { + if (pnpbios_disabled || dmi_check_system(pnpbios_dmi_table) || + paravirt_enabled()) { printk(KERN_INFO "PnPBIOS: Disabled\n"); return -ENODEV; } _ Patches currently in -mm which might be from rusty@xxxxxxxxxxxxxxx are origin.patch prep-for-paravirt-be-careful-about-touching-bios.patch prep-for-paravirt-be-careful-about-touching-bios-warning-fix.patch paravirtualization-header-and-stubs-for-fix.patch paravirtualization-patch-inline-replacements-for-fix-2.patch paravirtualization-patch-inline-replacements-for-fix-3.patch paravirtualization-more-generic-paravirtualization-warning-fix.patch generic-bug-implementation.patch generic-bug-for-i386.patch generic-bug-for-x86-64.patch bug-test-1.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