diff --git a/[refs] b/[refs] index 30532fea3948..47c334703ab7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0963aba54aa26c89114dca7257acf8c938bfec8a +refs/heads/master: 6660316cb7a1a2c59a73a52870490c0f782f45c1 diff --git a/trunk/drivers/acpi/sleep/poweroff.c b/trunk/drivers/acpi/sleep/poweroff.c index 1fc86e6b5ab9..3d41d93a3db8 100644 --- a/trunk/drivers/acpi/sleep/poweroff.c +++ b/trunk/drivers/acpi/sleep/poweroff.c @@ -54,7 +54,6 @@ void acpi_power_off(void) acpi_sleep_prepare(ACPI_STATE_S5); local_irq_disable(); /* Some SMP machines only can poweroff in boot CPU */ - set_cpus_allowed(current, cpumask_of_cpu(0)); acpi_enter_sleep_state(ACPI_STATE_S5); }