1 files changed, 2 insertions, 7 deletions

diff --git a/arch/mips/kernel/signal-common.h b/arch/mips/kernel/signal-common.h
index 06805e09bcd3..0b85f827cd18 100644
--- a/arch/mips/kernel/signal-common.h
+++ b/arch/mips/kernel/signal-common.h
@@ -28,12 +28,7 @@ extern void __user *get_sigframe(struct ksignal *ksig, struct pt_regs *regs,
 extern int fpcsr_pending(unsigned int __user *fpcsr);
 
 /* Make sure we will not lose FPU ownership */
-#ifdef CONFIG_PREEMPT
-#define lock_fpu_owner()        preempt_disable()
-#define unlock_fpu_owner()      preempt_enable()
-#else
-#define lock_fpu_owner()        pagefault_disable()
-#define unlock_fpu_owner()      pagefault_enable()
-#endif
+#define lock_fpu_owner()        ({ preempt_disable(); pagefault_disable(); })
+#define unlock_fpu_owner()      ({ pagefault_enable(); preempt_enable(); })
 
 #endif  /* __SIGNAL_COMMON_H */