From 008f8cfca80af2e367df83135844e5639d2e7c71 Mon Sep 17 00:00:00 2001
From: Robin Holt <holt@sgi.com>
Date: Wed, 14 Dec 2005 06:58:05 -0600
Subject: [PATCH] --- yaml --- r: 15126 b: refs/heads/master c:
 27af4cfd11883073359bd5acab1962b0fa96a3bf h: refs/heads/master v: v3

---
 [refs]                              |  2 +-
 trunk/arch/ia64/kernel/process.c    |  2 ++
 trunk/drivers/acpi/processor_idle.c | 20 +++++---------------
 3 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/[refs] b/[refs]
index 73594b896ebf..4e99fc060168 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d3e4cefc86ce1aefc0e9aebdc56308cb4bd51997
+refs/heads/master: 27af4cfd11883073359bd5acab1962b0fa96a3bf
diff --git a/trunk/arch/ia64/kernel/process.c b/trunk/arch/ia64/kernel/process.c
index a4da715a360c..e9904c74d2ba 100644
--- a/trunk/arch/ia64/kernel/process.c
+++ b/trunk/arch/ia64/kernel/process.c
@@ -721,11 +721,13 @@ flush_thread (void)
 	/* drop floating-point and debug-register state if it exists: */
 	current->thread.flags &= ~(IA64_THREAD_FPH_VALID | IA64_THREAD_DBG_VALID);
 	ia64_drop_fpu(current);
+#ifdef CONFIG_IA32_SUPPORT
 	if (IS_IA32_PROCESS(ia64_task_regs(current))) {
 		ia32_drop_partial_page_list(current);
 		current->thread.task_size = IA32_PAGE_OFFSET;
 		set_fs(USER_DS);
 	}
+#endif
 }
 
 /*
diff --git a/trunk/drivers/acpi/processor_idle.c b/trunk/drivers/acpi/processor_idle.c
index 807b0df308f1..5f51057518b0 100644
--- a/trunk/drivers/acpi/processor_idle.c
+++ b/trunk/drivers/acpi/processor_idle.c
@@ -274,6 +274,8 @@ static void acpi_processor_idle(void)
 		}
 	}
 
+	cx->usage++;
+
 #ifdef CONFIG_HOTPLUG_CPU
 	/*
 	 * Check for P_LVL2_UP flag before entering C2 and above on
@@ -281,12 +283,9 @@ static void acpi_processor_idle(void)
 	 * detection phase, to work cleanly with logical CPU hotplug.
 	 */
 	if ((cx->type != ACPI_STATE_C1) && (num_online_cpus() > 1) && 
-	    !pr->flags.has_cst && !acpi_fadt.plvl2_up)
-		cx = &pr->power.states[ACPI_STATE_C1];
+	    !pr->flags.has_cst && acpi_fadt.plvl2_up)
+		cx->type = ACPI_STATE_C1;
 #endif
-
-	cx->usage++;
-
 	/*
 	 * Sleep:
 	 * ------
@@ -387,15 +386,6 @@ static void acpi_processor_idle(void)
 
 	next_state = pr->power.state;
 
-#ifdef CONFIG_HOTPLUG_CPU
-	/* Don't do promotion/demotion */
-	if ((cx->type == ACPI_STATE_C1) && (num_online_cpus() > 1) &&
-	    !pr->flags.has_cst && !acpi_fadt.plvl2_up) {
-		next_state = cx;
-		goto end;
-	}
-#endif
-
 	/*
 	 * Promotion?
 	 * ----------
@@ -567,7 +557,7 @@ static int acpi_processor_get_power_info_fadt(struct acpi_processor *pr)
 	 * Check for P_LVL2_UP flag before entering C2 and above on
 	 * an SMP system. 
 	 */
-	if ((num_online_cpus() > 1) && !acpi_fadt.plvl2_up)
+	if ((num_online_cpus() > 1) && acpi_fadt.plvl2_up)
 		return_VALUE(-ENODEV);
 #endif