Skip to content

L
linux
Commit 7af0f30f authored by Len Brown's avatar Len Brown Committed by Len Brown
Browse files
Options

[ACPI] set acpi_disabled=1 on failure for clean /proc 

  http://bugzilla.kernel.org/show_bug.cgi?id=991
parent 434b274f
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
arch/i386/kernel/acpi/boot.c
View file @ 7af0f30f
...@@ -416,8 +416,10 @@ acpi_boot_init (void) ...@@ -416,8 +416,10 @@ acpi_boot_init (void)
* Initialize the ACPI boot-time table parser. * Initialize the ACPI boot-time table parser.
*/ */
result = acpi_table_init(); result = acpi_table_init();
if (result) if (result) {
acpi_disabled = 1;
return result; return result;
}
result = acpi_blacklisted(); result = acpi_blacklisted();
if (result) { if (result) {
......
arch/x86_64/kernel/acpi/boot.c
View file @ 7af0f30f
...@@ -393,8 +393,10 @@ acpi_boot_init (void) ...@@ -393,8 +393,10 @@ acpi_boot_init (void)
* Initialize the ACPI boot-time table parser. * Initialize the ACPI boot-time table parser.
*/ */
result = acpi_table_init(); result = acpi_table_init();
if (result) if (result) {
acpi_disabled = 1;
return result; return result;
}
result = acpi_blacklisted(); result = acpi_blacklisted();
if (result) { if (result) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7