diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-05-03 11:39:36 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-05-03 11:39:36 +0200 |
commit | f91eeeb59583087722dc0699ac8aaf4b6af4a77f (patch) | |
tree | 7ea886877cfdfbc8cc6f50aa1f379de62a9092f1 /arch/parisc/kernel/cache.c | |
parent | 4ca231b2e6ed171107c5b21f9e92d1965fd6fd9e (diff) | |
parent | 9631c02e240236ec206394fb52380647d0e70e4f (diff) | |
download | linux-3.10-f91eeeb59583087722dc0699ac8aaf4b6af4a77f.tar.gz linux-3.10-f91eeeb59583087722dc0699ac8aaf4b6af4a77f.tar.bz2 linux-3.10-f91eeeb59583087722dc0699ac8aaf4b6af4a77f.zip |
Merge tag 'asoc-v3.10-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.10
A few more bug fixes, the DAPM clock fix is actually a driver specific
one since currently there's only one user of the clock support due to
the problems relying on the clock API.
Diffstat (limited to 'arch/parisc/kernel/cache.c')
-rw-r--r-- | arch/parisc/kernel/cache.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/parisc/kernel/cache.c b/arch/parisc/kernel/cache.c index 4b12890642e..83ded26cad0 100644 --- a/arch/parisc/kernel/cache.c +++ b/arch/parisc/kernel/cache.c @@ -421,14 +421,11 @@ void purge_tlb_entries(struct mm_struct *mm, unsigned long addr) /* Note: purge_tlb_entries can be called at startup with no context. */ - /* Disable preemption while we play with %sr1. */ - preempt_disable(); - mtsp(mm->context, 1); purge_tlb_start(flags); + mtsp(mm->context, 1); pdtlb(addr); pitlb(addr); purge_tlb_end(flags); - preempt_enable(); } EXPORT_SYMBOL(purge_tlb_entries); |