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

http://bugzilla.kernel.org/show_bug.cgi?id=991

[ACPI] set acpi_disabled=1 on failure for clean /proc
http://bugzilla.kernel.org/show_bug.cgi?id=991
7af0f30f · Len Brown · Len Brown · 434b274f · 7af0f30f · 7af0f30f
Commit 7af0f30f authored Dec 15, 2003 by Len Brown Committed by Len Brown Dec 15, 2003
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

arch/i386/kernel/acpi/boot.c arch/i386/kernel/acpi/boot.c +3 -1

arch/x86_64/kernel/acpi/boot.c arch/x86_64/kernel/acpi/boot.c +3 -1

No files found.
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -416,8 +416,10 @@ acpi_boot_init (void)
 	 * Initialize the ACPI boot-time table parser.
 	 */
 	result = acpi_table_init();
-	if (result)
+	if (result) {
+		acpi_disabled = 1;
 		return result;
+	}

 	result = acpi_blacklisted();
 	if (result) {

--- a/arch/x86_64/kernel/acpi/boot.c
+++ b/arch/x86_64/kernel/acpi/boot.c
@@ -393,8 +393,10 @@ acpi_boot_init (void)
 	 * Initialize the ACPI boot-time table parser.
 	 */
 	result = acpi_table_init();
-	if (result)
+	if (result) {
+		acpi_disabled = 1;
 		return result;
+	}

 	result = acpi_blacklisted();
 	if (result) {