From ea6bb78f2da4f4366b572d956ea9df61afcb46e4 Mon Sep 17 00:00:00 2001 From: chs Date: Wed, 22 Mar 2017 23:36:02 +0000 Subject: [PATCH] in vfp_state_load(), fix backwards logic for fpinst vs. fpinst2. --- sys/arch/arm/vfp/vfp_init.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/arch/arm/vfp/vfp_init.c b/sys/arch/arm/vfp/vfp_init.c index 2bdce1a8321f..a1e4af840456 100644 --- a/sys/arch/arm/vfp/vfp_init.c +++ b/sys/arch/arm/vfp/vfp_init.c @@ -1,4 +1,4 @@ -/* $NetBSD: vfp_init.c,v 1.51 2017/03/16 16:13:20 chs Exp $ */ +/* $NetBSD: vfp_init.c,v 1.52 2017/03/22 23:36:02 chs Exp $ */ /* * Copyright (c) 2008 ARM Ltd @@ -546,9 +546,9 @@ vfp_state_load(lwp_t *l, u_int flags) if (fregs->vfp_fpexc & VFP_FPEXC_EX) { /* Need to restore the exception handling state. */ - armreg_fpinst2_write(fregs->vfp_fpinst2); + armreg_fpinst_write(fregs->vfp_fpinst); if (fregs->vfp_fpexc & VFP_FPEXC_FP2V) - armreg_fpinst_write(fregs->vfp_fpinst); + armreg_fpinst2_write(fregs->vfp_fpinst2); } }