diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-21 11:39:21 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-05-21 11:39:21 -0500 |
| commit | 4510dbe324876f2f2f3dc9931e97ec0e98f1ee26 (patch) | |
| tree | d42a8ff24b82e0c6b01756b3f2c33756fc30fc17 /arch/x86/kernel/process.c | |
| parent | b296263398f08d21e68d5d7b2afc43228c208b71 (diff) | |
| parent | c7788792a5e7b0d5d7f96d0766b4cb6112d47d75 (diff) | |
| download | linux-4510dbe324876f2f2f3dc9931e97ec0e98f1ee26.tar.gz linux-4510dbe324876f2f2f3dc9931e97ec0e98f1ee26.tar.bz2 linux-4510dbe324876f2f2f3dc9931e97ec0e98f1ee26.zip | |
Merge tag 'v3.10-rc2' into asoc-ux500
Linux 3.10-rc2
Diffstat (limited to 'arch/x86/kernel/process.c')
| -rw-r--r-- | arch/x86/kernel/process.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 607af0d4d5ef..4e7a37ff03ab 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -312,6 +312,8 @@ void arch_cpu_idle(void) { if (cpuidle_idle_call()) x86_idle(); + else + local_irq_enable(); } /* @@ -368,9 +370,6 @@ void amd_e400_remove_cpu(int cpu) */ static void amd_e400_idle(void) { - if (need_resched()) - return; - if (!amd_e400_c1e_detected) { u32 lo, hi; |