diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:52:16 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-05-29 06:52:16 -0400 |
| commit | 8a90bb5116889e98008fbc8178fc2a77bb51df4a (patch) | |
| tree | 210b6755c9ae2d0d66a79f8696469ab50b7621ad /arch/x86/kernel/process.c | |
| parent | d47333ddb234dbc661ab2a4fe019758bd33ba33b (diff) | |
| parent | 1ab9ecc24819a8cf8ee982aaf6fb83298f094b0d (diff) | |
Merge tag 'asoc-v3.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.10
A series of driver specific updates, none particularly critical, plus
one fix to the compressed API code to handle capture streams properly
which is very safe for mainline as there's no current users.
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) | |||
| 312 | { | 312 | { |
| 313 | if (cpuidle_idle_call()) | 313 | if (cpuidle_idle_call()) |
| 314 | x86_idle(); | 314 | x86_idle(); |
| 315 | else | ||
| 316 | local_irq_enable(); | ||
| 315 | } | 317 | } |
| 316 | 318 | ||
| 317 | /* | 319 | /* |
| @@ -368,9 +370,6 @@ void amd_e400_remove_cpu(int cpu) | |||
| 368 | */ | 370 | */ |
| 369 | static void amd_e400_idle(void) | 371 | static void amd_e400_idle(void) |
| 370 | { | 372 | { |
| 371 | if (need_resched()) | ||
| 372 | return; | ||
| 373 | |||
| 374 | if (!amd_e400_c1e_detected) { | 373 | if (!amd_e400_c1e_detected) { |
| 375 | u32 lo, hi; | 374 | u32 lo, hi; |
| 376 | 375 | ||
