diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:33:09 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-03-31 12:33:09 +0200 |
| commit | 69dd89fd2b9406603d218cab8996cfb232d5b8b9 (patch) | |
| tree | 467a65877d0c550ae7c937bc658abd313958122f /arch/sparc/kernel/process_64.c | |
| parent | 8c1d843460f42417d6b9553147a1a04ca1470602 (diff) | |
| parent | c159a85013afbb8283f0c7272812952e04d5c3a1 (diff) | |
| download | talos-obmc-linux-69dd89fd2b9406603d218cab8996cfb232d5b8b9.tar.gz talos-obmc-linux-69dd89fd2b9406603d218cab8996cfb232d5b8b9.zip | |
Merge tag 'asoc-v3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Final updates for v3.15 merge window
A few more updates from last week - use of the tdm_slot mapping from
Xiubo plus a few smaller fixes and cleanups.
Diffstat (limited to 'arch/sparc/kernel/process_64.c')
| -rw-r--r-- | arch/sparc/kernel/process_64.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/sparc/kernel/process_64.c b/arch/sparc/kernel/process_64.c index 32a280ec38c1..d7b4967f8fa6 100644 --- a/arch/sparc/kernel/process_64.c +++ b/arch/sparc/kernel/process_64.c @@ -58,9 +58,12 @@ void arch_cpu_idle(void) { if (tlb_type != hypervisor) { touch_nmi_watchdog(); + local_irq_enable(); } else { unsigned long pstate; + local_irq_enable(); + /* The sun4v sleeping code requires that we have PSTATE.IE cleared over * the cpu sleep hypervisor call. */ @@ -82,7 +85,6 @@ void arch_cpu_idle(void) : "=&r" (pstate) : "i" (PSTATE_IE)); } - local_irq_enable(); } #ifdef CONFIG_HOTPLUG_CPU |
