Merge branch 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6

* 'idle-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-idle-2.6:
  intel_idle: native hardware cpuidle driver for latest Intel processors
  ACPI: acpi_idle: touch TS_POLLING only in the non-MWAIT case
  acpi_pad: uses MONITOR/MWAIT, so it doesn't need to clear TS_POLLING
  sched: clarify commment for TS_POLLING
  ACPI: allow a native cpuidle driver to displace ACPI
  cpuidle: make cpuidle_curr_driver static
  cpuidle: add cpuidle_unregister_driver() error check
  cpuidle: fail to register if !CONFIG_CPU_IDLE

3 files changed, 26 insertions, 26 deletions

diff --git a/drivers/acpi/acpi_pad.c b/drivers/acpi/acpi_pad.c
index f169e516a1a..d269a8f3329 100644
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
@@ -172,13 +172,6 @@ static int power_saving_thread(void *data)
 
                 do_sleep = 0;
 
-                current_thread_info()->status &= ~TS_POLLING;
-                /*
-                 * TS_POLLING-cleared state must be visible before we test
-                 * NEED_RESCHED:
-                 */
-                smp_mb();
-
                 expire_time = jiffies + HZ * (100 - idle_pct) / 100;
 
                 while (!need_resched()) {
@@ -209,8 +202,6 @@ static int power_saving_thread(void *data)
                         }
                 }
 
-                current_thread_info()->status |= TS_POLLING;
-
                 /*
                  * current sched_rt has threshold for rt task running time.
                  * When a rt task uses 95% CPU time, the rt thread will be
diff --git a/drivers/acpi/processor_driver.c b/drivers/acpi/processor_driver.c
index 5675d9747e8..b1034a9ada4 100644
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
@@ -616,7 +616,8 @@ static int __cpuinit acpi_processor_add(struct acpi_device *device)
         acpi_processor_get_limit_info(pr);
 
 
-        acpi_processor_power_init(pr, device);
+        if (cpuidle_get_driver() == &acpi_idle_driver)
+                acpi_processor_power_init(pr, device);
 
         pr->cdev = thermal_cooling_device_register("Processor", device,
                                                 &processor_cooling_ops);
@@ -920,9 +921,14 @@ static int __init acpi_processor_init(void)
         if (!acpi_processor_dir)
                 return -ENOMEM;
 #endif
-        result = cpuidle_register_driver(&acpi_idle_driver);
-        if (result < 0)
-                goto out_proc;
+
+        if (!cpuidle_register_driver(&acpi_idle_driver)) {
+                printk(KERN_DEBUG "ACPI: %s registered with cpuidle\n",
+                        acpi_idle_driver.name);
+        } else {
+                printk(KERN_DEBUG "ACPI: acpi_idle yielding to %s",
+                        cpuidle_get_driver()->name);
+        }
 
         result = acpi_bus_register_driver(&acpi_processor_driver);
         if (result < 0)
@@ -941,7 +947,6 @@ static int __init acpi_processor_init(void)
 out_cpuidle:
         cpuidle_unregister_driver(&acpi_idle_driver);
 
-out_proc:
 #ifdef CONFIG_ACPI_PROCFS
         remove_proc_entry(ACPI_PROCESSOR_CLASS, acpi_root_dir);
 #endif
diff --git a/drivers/acpi/processor_idle.c b/drivers/acpi/processor_idle.c
index 13c6cb703f1..2e8c27d48f2 100644
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
@@ -872,6 +872,7 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
                 return(acpi_idle_enter_c1(dev, state));
 
         local_irq_disable();
+
         if (cx->entry_method != ACPI_CSTATE_FFH) {
                 current_thread_info()->status &= ~TS_POLLING;
                 /*
@@ -879,12 +880,12 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
                  * NEED_RESCHED:
                  */
                 smp_mb();
-        }
 
-        if (unlikely(need_resched())) {
-                current_thread_info()->status |= TS_POLLING;
-                local_irq_enable();
-                return 0;
+                if (unlikely(need_resched())) {
+                        current_thread_info()->status |= TS_POLLING;
+                        local_irq_enable();
+                        return 0;
+                }
         }
 
         /*
@@ -911,7 +912,8 @@ static int acpi_idle_enter_simple(struct cpuidle_device *dev,
         sched_clock_idle_wakeup_event(idle_time_ns);
 
         local_irq_enable();
-        current_thread_info()->status |= TS_POLLING;
+        if (cx->entry_method != ACPI_CSTATE_FFH)
+                current_thread_info()->status |= TS_POLLING;
 
         cx->usage++;
 
@@ -962,6 +964,7 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         }
 
         local_irq_disable();
+
         if (cx->entry_method != ACPI_CSTATE_FFH) {
                 current_thread_info()->status &= ~TS_POLLING;
                 /*
@@ -969,12 +972,12 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
                  * NEED_RESCHED:
                  */
                 smp_mb();
-        }
 
-        if (unlikely(need_resched())) {
-                current_thread_info()->status |= TS_POLLING;
-                local_irq_enable();
-                return 0;
+                if (unlikely(need_resched())) {
+                        current_thread_info()->status |= TS_POLLING;
+                        local_irq_enable();
+                        return 0;
+                }
         }
 
         acpi_unlazy_tlb(smp_processor_id());
@@ -1028,7 +1031,8 @@ static int acpi_idle_enter_bm(struct cpuidle_device *dev,
         sched_clock_idle_wakeup_event(idle_time_ns);
 
         local_irq_enable();
-        current_thread_info()->status |= TS_POLLING;
+        if (cx->entry_method != ACPI_CSTATE_FFH)
+                current_thread_info()->status |= TS_POLLING;
 
         cx->usage++;