summaryrefslogtreecommitdiffstats
path: root/arch/powerpc/kernel/process.c
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2017-09-04 21:40:34 +0300
committerJani Nikula <jani.nikula@intel.com>2017-09-04 21:40:34 +0300
commitd149d6ae17197ce23e2cd6bc5fcdacf7b593e55e (patch)
tree2fb8d66199080f6d7b41690f6e8616ccd79a1943 /arch/powerpc/kernel/process.c
parentafe722bee4bf8afc88c6ff7d6f781515d9428595 (diff)
parent7846b12fe0b5feab5446d892f41b5140c1419109 (diff)
downloadlinux-d149d6ae17197ce23e2cd6bc5fcdacf7b593e55e.tar.bz2
Merge drm-upstream/drm-next into drm-intel-next-queued
Catch up with upstream while it's easy. Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'arch/powerpc/kernel/process.c')
-rw-r--r--arch/powerpc/kernel/process.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 9f3e2c932dcc..ec480966f9bf 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -511,10 +511,6 @@ void restore_math(struct pt_regs *regs)
{
unsigned long msr;
- /*
- * Syscall exit makes a similar initial check before branching
- * to restore_math. Keep them in synch.
- */
if (!msr_tm_active(regs->msr) &&
!current->thread.load_fp && !loadvec(current->thread))
return;