--- drivers/acpi/processor_idle.c

+++ drivers/acpi/processor_idle.c

@@ -888,12 +888,14 @@ static int acpi_idle_enter_simple(struct

return(acpi_idle_enter_c1(dev, state));

local_irq_disable();

- current_thread_info()->status &= ~TS_POLLING;

- /*

- * TS_POLLING-cleared state must be visible before we test

- * NEED_RESCHED:

- */

- smp_mb();

+ if (cx->entry_method != ACPI_CSTATE_FFH) {

+ current_thread_info()->status &= ~TS_POLLING;

+ /*

+ * TS_POLLING-cleared state must be visible before we test

+ * NEED_RESCHED:

+ */

+ smp_mb();

+ }

if (unlikely(need_resched())) {

current_thread_info()->status |= TS_POLLING;

@@ -960,7 +962,7 @@ static int acpi_idle_enter_bm(struct cpu

if (acpi_idle_suspend)

return(acpi_idle_enter_c1(dev, state));

- if (acpi_idle_bm_check()) {

+ if (!cx->bm_sts_skip && acpi_idle_bm_check()) {

if (dev->safe_state) {

dev->last_state = dev->safe_state;

return dev->safe_state->enter(dev, dev->safe_state);

@@ -973,12 +975,14 @@ static int acpi_idle_enter_bm(struct cpu

}

local_irq_disable();

- current_thread_info()->status &= ~TS_POLLING;

- /*

- * TS_POLLING-cleared state must be visible before we test

- * NEED_RESCHED:

- */

- smp_mb();

+ if (cx->entry_method != ACPI_CSTATE_FFH) {

+ current_thread_info()->status &= ~TS_POLLING;

+ /*

+ * TS_POLLING-cleared state must be visible before we test

+ * NEED_RESCHED:

+ */

+ smp_mb();

+ }

if (unlikely(need_resched())) {

current_thread_info()->status |= TS_POLLING;