summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLin Ming <ming.m.lin@intel.com>2010-12-09 16:50:52 +0800
committerLen Brown <len.brown@intel.com>2010-12-11 01:28:58 -0500
commitd90aa92c0c1625d7f02050e4d2924805840cda3d (patch)
tree89696463c63038cb37609873951b0cdb4dc473f6 /include
parentcf7d7e5a1980d1116ee152d25dac382b112b9c17 (diff)
downloadlinux-3.10-d90aa92c0c1625d7f02050e4d2924805840cda3d.tar.gz
linux-3.10-d90aa92c0c1625d7f02050e4d2924805840cda3d.tar.bz2
linux-3.10-d90aa92c0c1625d7f02050e4d2924805840cda3d.zip
acpi: fix _OSI string setup regression
commit b0ed7a91(ACPICA/ACPI: Add new host interfaces for _OSI suppor) introduced a regression that _OSI string setup fails. There are 2 paths to setup _OSI string. DMI: acpi_dmi_osi_linux -> set_osi_linux -> acpi_osi_setup -> copy _OSI string to osi_setup_string Boot command line: acpi_osi_setup -> copy _OSI string to osi_setup_string Later, acpi_osi_setup_late will be called to handle osi_setup_string. If _OSI string is "Linux" or "!Linux", then the call path is, acpi_osi_setup_late -> acpi_cmdline_osi_linux -> set_osi_linux -> acpi_osi_setup -> copy _OSI string to osi_setup_string This actually never installs _OSI string(acpi_install_interface not called), but just copy the _OSI string to osi_setup_string. This patch fixes the regression. Reported-and-tested-by: Lukas Hejtmanek <xhejtman@ics.muni.cz> Signed-off-by: Lin Ming <ming.m.lin@intel.com> Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/acpi.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 050a7bccb83..67c91b4418b 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -219,7 +219,7 @@ static inline int acpi_video_display_switch_support(void)
extern int acpi_blacklisted(void);
extern void acpi_dmi_osi_linux(int enable, const struct dmi_system_id *d);
-extern int acpi_osi_setup(char *str);
+extern void acpi_osi_setup(char *str);
#ifdef CONFIG_ACPI_NUMA
int acpi_get_pxm(acpi_handle handle);