The patch titled
ACPI: fix acpi_osi=!Linux
has been removed from the -mm tree. Its filename was
acpi-fix-acpi_osi=linux.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: ACPI: fix acpi_osi=!Linux
From: Len Brown <lenb@xxxxxxxxxx>
Need to check for special case "acpi_osi=!Linux" before general case
"acpi_osi=!*", or it will have no effect.
Signed-off-by: Len Brown <len.brown@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/acpi/osl.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -puN drivers/acpi/osl.c~acpi-fix-acpi_osi=linux drivers/acpi/osl.c
--- a/drivers/acpi/osl.c~acpi-fix-acpi_osi=linux
+++ a/drivers/acpi/osl.c
@@ -993,11 +993,11 @@ static int __init acpi_osi_setup(char *s
if (str == NULL || *str == '\0') {
printk(KERN_INFO PREFIX "_OSI method disabled\n");
acpi_gbl_create_osi_method = FALSE;
+ } else if (!strcmp("!Linux", str)) {
+ enable_osi_linux(0);
} else if (*str == '!') {
if (acpi_osi_invalidate(++str) == AE_OK)
printk(KERN_INFO PREFIX "Deleted _OSI(%s)\n", str);
- } else if (!strcmp("!Linux", str)) {
- enable_osi_linux(0);
} else if (!strcmp("Linux", str)) {
enable_osi_linux(1);
} else if (*osi_additional_string == '\0') {
_
Patches currently in -mm which might be from lenb@xxxxxxxxxx are
origin.patch
i386-es7000-build-breakage-fix.patch
exit-acpi-processor-module-gracefully-if-acpi-is-disabled.patch
fix-empty-macros-in-acpi.patch
acpi-enable-c3-power-state-on-dell-inspiron-8200.patch
git-battery-vs-git-acpi.patch
revert-acpi-change-for-scsi.patch
restore-acpi-change-for-scsi.patch
x86_64-acpi-disable-srat-when-numa-emulation-succeeds.patch
x86_64-acpi-disable-srat-when-numa-emulation-succeeds-fix.patch
x86_64-slit-fake-pxm-to-node-mapping-for-fake-numa-2.patch
mmconfig-validate-against-acpi-motherboard-resources-fix-2-3.patch
nohz-fix-nohz-x86-dyntick-idle-handling.patch
acpi-move-timer-broadcast-and-pmtimer-access-before-c3-arbiter-shutdown.patch
i386-x86_64-insert-hpet-firmware-resource-after-pci-enumeration-has-completed.patch
acpi-do-not-prepare-for-hibernation-in-acpi_shutdown.patch
rtc-add-support-for-the-st-m48t59-rtc-vs-git-acpi.patch
intel-iommu-dmar-detection-and-parsing-logic.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
