[prev in list] [next in list] [prev in thread] [next in thread] 

List:       git-commits-24
Subject:    Merge intel.com:/home/lenb/src/linux-acpi-test-2.4.22
From:       Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date:       2004-03-30 22:08:53
Message-ID: 200404012003.i31K3Dge002298 () hera ! kernel ! org
[Download RAW message or body]

ChangeSet 1.1302.55.2, 2004/03/30 17:08:53-05:00, len.brown@intel.com

	Merge intel.com:/home/lenb/src/linux-acpi-test-2.4.22
	into intel.com:/home/lenb/src/linux-acpi-test-2.4.25


# This patch includes the following deltas:
#	           ChangeSet	1.1302.55.1+1.1063.46.92 -> 1.1302.55.2
#	include/asm-i386/acpi.h	1.13.1.1 -> 1.16   
#	arch/i386/kernel/acpi.c	1.20.2.3 -> 1.20.1.6
#

 arch/i386/kernel/acpi.c |    6 +++---
 include/asm-i386/acpi.h |    3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)


diff -Nru a/arch/i386/kernel/acpi.c b/arch/i386/kernel/acpi.c
--- a/arch/i386/kernel/acpi.c	Thu Apr  1 12:03:14 2004
+++ b/arch/i386/kernel/acpi.c	Thu Apr  1 12:03:14 2004
@@ -368,7 +368,7 @@
  * 	acpi_lapic = 1 if LAPIC found
  *	acpi_ioapic = 1 if IOAPIC found
  *	if (acpi_lapic && acpi_ioapic) smp_found_config = 1;
- *	if acpi_blacklisted() acpi_disabled = 1;
+ *	if acpi_blacklisted() disable_acpi()
  *	acpi_irq_model=...
  *	...
  *
@@ -395,14 +395,14 @@
 	 */
 	result = acpi_table_init();
 	if (result) {
-		acpi_disabled = 1;
+		disable_acpi();
 		return result;
 	}
 
 	result = acpi_blacklisted();
 	if (result) {
 		printk(KERN_NOTICE PREFIX "BIOS listed in blacklist, disabling ACPI support\n");
-		acpi_disabled = 1;
+		disable_acpi();
 		return result;
 	}
 
diff -Nru a/include/asm-i386/acpi.h b/include/asm-i386/acpi.h
--- a/include/asm-i386/acpi.h	Thu Apr  1 12:03:14 2004
+++ b/include/asm-i386/acpi.h	Thu Apr  1 12:03:14 2004
@@ -105,6 +105,9 @@
 extern int acpi_ioapic;
 extern int acpi_noirq;
 extern int acpi_strict;
+extern int acpi_disabled;
+extern int acpi_ht;
+static inline void disable_acpi(void) { acpi_disabled = 1; acpi_ht = 0; }
 
 /* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */
 #define FIX_ACPI_PAGES 4
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-24" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]