Merge intel.com:/home/lenb/src/linux-acpi-test-2.6.0

into intel.com:/home/lenb/bk/linux-acpi-test-2.6.0

arch/i386/kernel/cpu/cpufreq/acpi.c

@@ -231,7 +231,7 @@ acpi_processor_set_performance (
 	int			state)
 {
 	u16			port = 0;
-	u8			value = 0;
+	u16			value = 0;
 	int			i = 0;
 	struct cpufreq_freqs    cpufreq_freqs;
 
@@ -282,9 +282,9 @@ acpi_processor_set_performance (
 	value = (u16) perf->states[state].control;
 
 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, 
-		"Writing 0x%02x to port 0x%04x\n", value, port));
+		"Writing 0x%04x to port 0x%04x\n", value, port));
 
-	outb(value, port); 
+	outw(value, port); 
 
 	/*
 	 * Then we read the 'status_register' and compare the value with the
@@ -296,12 +296,12 @@ acpi_processor_set_performance (
 	port = perf->status_register;
 
 	ACPI_DEBUG_PRINT((ACPI_DB_INFO, 
-		"Looking for 0x%02x from port 0x%04x\n",
-		(u8) perf->states[state].status, port));
+		"Looking for 0x%04x from port 0x%04x\n",
+		(u16) perf->states[state].status, port));
 
 	for (i=0; i<100; i++) {
-		value = inb(port);
-		if (value == (u8) perf->states[state].status)
+		value = inw(port);
+		if (value == (u16) perf->states[state].status)
 			break;
 		udelay(10);
 	}
@@ -309,7 +309,7 @@ acpi_processor_set_performance (
 	/* notify cpufreq */
 	cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE);
 
-	if (value != perf->states[state].status) {
+	if (value != (u16) perf->states[state].status) {
 		unsigned int tmp = cpufreq_freqs.new;
 		cpufreq_freqs.new = cpufreq_freqs.old;
 		cpufreq_freqs.old = tmp;

drivers/acpi/Kconfig

@@ -40,41 +40,15 @@ config ACPI
 	  available at:
 	  <http://www.acpi.info>
 
-config ACPI_HT_ONLY
-	bool "Restrict ACPI to minimum boot code to enable HT"
-	depends on X86
-	depends on ACPI
-	depends on SMP
-	default n
-	---help---
-	  ACPI enumerates both logical (a.k.a. Hyper-Threaded -- HT)
-	  and physical processors.  It is designed to obsolete several older
-	  specifications, including the MultiProcessor Specification (MPS),
-	  which supported only physical processors.
-
-	  CONFIG_ACPI_HT_ONLY includes just the minimal ACPI boot-time code
-	  necessary to enumerate logical processors and enable HT.
-
-	  CONFIG_ACPI includes this, plus IO APIC enumeration,
-	  and the hooks to run the ACPI AML interpreter for run-time events.
-
-	  When CONFIG_ACPI is selected, the command-line option "acpi=ht"
-	  is available to run just the ACPI boot-time code -- just as if
-	  only CONFIG_ACPI_HT_ONLY were selected.
-
-	  Note that "acpi=off" can be used to disable all ACPI code in the kernel.
-
-
 config ACPI_BOOT
 	bool
-	depends on ACPI
+	depends on ACPI || X86_HT
 	default y
 
 config ACPI_INTERPRETER
 	bool
 	depends on ACPI
 	depends on !IA64_SGI_SN
-	depends on !ACPI_HT_ONLY
 	default y
 
 config ACPI_SLEEP
@@ -281,7 +255,7 @@ config ACPI_EFI
 	default y
 
 config ACPI_RELAXED_AML
-	bool
+	bool "Relaxed AML"
 	depends on ACPI_INTERPRETER
 	depends on !IA64_SGI_SN
 	default n

drivers/acpi/pci_link.c

@@ -500,15 +500,15 @@ static int acpi_pci_link_allocate(struct acpi_pci_link* link) {
 		irq = link->irq.active;
 	} else {
 		irq = link->irq.possible[0];
-	}
 
-	/* 
-	 * Select the best IRQ.  This is done in reverse to promote 
-	 * the use of IRQs 9, 10, 11, and >15.
-	 */
-	for (i=(link->irq.possible_count-1); i>0; i--) {
-		if (acpi_irq_penalty[irq] > acpi_irq_penalty[link->irq.possible[i]])
-			irq = link->irq.possible[i];
+		/*
+		 * Select the best IRQ.  This is done in reverse to promote
+		 * the use of IRQs 9, 10, 11, and >15.
+		 */
+		for (i=(link->irq.possible_count-1); i>0; i--) {
+			if (acpi_irq_penalty[irq] > acpi_irq_penalty[link->irq.possible[i]])
+				irq = link->irq.possible[i];
+		}
 	}
 
 	/* Attempt to enable the link device at this IRQ. */