[src/trunk]: src/sys/arch/arm/arm Make sure that if _UC_FPU is set, that _UC_...

[matt <matt%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c909da925535
branches:  trunk
changeset: 783151:c909da925535
user:      matt <matt%NetBSD.org@localhost>
date:      Sat Dec 08 06:47:31 2012 +0000

description:
Make sure that if _UC_FPU is set, that _UC_ARM_VFP is also set.

diffstat:

 sys/arch/arm/arm/sig_machdep.c |  7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diffs (28 lines):

diff -r d7e2f7559ea6 -r c909da925535 sys/arch/arm/arm/sig_machdep.c
--- a/sys/arch/arm/arm/sig_machdep.c    Sat Dec 08 06:46:49 2012 +0000
+++ b/sys/arch/arm/arm/sig_machdep.c    Sat Dec 08 06:47:31 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: sig_machdep.c,v 1.44 2012/12/05 19:05:46 matt Exp $    */
+/*     $NetBSD: sig_machdep.c,v 1.45 2012/12/08 06:47:31 matt Exp $    */
 
 /*
  * Copyright (c) 1994-1998 Mark Brinicombe.
@@ -44,7 +44,7 @@
 
 #include <sys/param.h>
 
-__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.44 2012/12/05 19:05:46 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sig_machdep.c,v 1.45 2012/12/08 06:47:31 matt Exp $");
 
 #include <sys/mount.h>         /* XXX only needed by syscallargs.h */
 #include <sys/proc.h>
@@ -219,7 +219,8 @@
        int error;
 
 #ifdef FPU_VFP
-       if ((flags & _UC_FPU) && curcpu()->ci_vfp_id == 0)
+       if ((flags & _UC_FPU)
+           && (curcpu()->ci_vfp_id || (flags & _UC_ARM_VFP) == 0))
                return EINVAL;
 #endif