summaryrefslogtreecommitdiffstats
path: root/arch/mips/kernel/traps.c
diff options
context:
space:
mode:
authorPeter Zijlstra2018-03-15 11:45:44 +0100
committerIngo Molnar2018-03-20 08:23:23 +0100
commit6887a56b6e8ef5daf1160f2ebe5cbe38fd8819a2 (patch)
treef618aea7ea09bfddc275ff0eab7d1cb3673a3489 /arch/mips/kernel/traps.c
parentsched/wait, fs/ocfs2: Convert wait_on_atomic_t() usage to the new wait_var_ev... (diff)
downloadkernel-qcow2-linux-6887a56b6e8ef5daf1160f2ebe5cbe38fd8819a2.tar.gz
kernel-qcow2-linux-6887a56b6e8ef5daf1160f2ebe5cbe38fd8819a2.tar.xz
kernel-qcow2-linux-6887a56b6e8ef5daf1160f2ebe5cbe38fd8819a2.zip
sched/wait, arch/mips: Fix and convert wait_on_atomic_t() usage to the new wait_var_event() API
The old wait_on_atomic_t() is going to get removed, use the more flexible wait_var_event() API instead. And while there, fix a bug and add the missing wakeup... Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: James Hogan <jhogan@kernel.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Ralf Baechle <ralf@linux-mips.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: linux-kernel@vger.kernel.org Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/mips/kernel/traps.c')
-rw-r--r--arch/mips/kernel/traps.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index 0ae4a731cc12..967e9e4e795e 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -1248,8 +1248,8 @@ static int enable_restore_fp_context(int msa)
* If an FP mode switch is currently underway, wait for it to
* complete before proceeding.
*/
- wait_on_atomic_t(&current->mm->context.fp_mode_switching,
- atomic_t_wait, TASK_KILLABLE);
+ wait_var_event(&current->mm->context.fp_mode_switching,
+ !atomic_read(&current->mm->context.fp_mode_switching));
if (!used_math()) {
/* First time FP context user. */