Module Name: src
Committed By: matt
Date: Mon Mar 1 19:26:57 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: mips_fpu.c
Log Message:
Put fp_lock and fp_cv in a common structure.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/mips/mips_fpu.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/mips_fpu.c
diff -u src/sys/arch/mips/mips/mips_fpu.c:1.1.2.1 src/sys/arch/mips/mips/mips_fpu.c:1.1.2.2
--- src/sys/arch/mips/mips/mips_fpu.c:1.1.2.1 Sun Feb 28 23:45:06 2010
+++ src/sys/arch/mips/mips/mips_fpu.c Mon Mar 1 19:26:57 2010
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mips_fpu.c,v 1.1.2.1 2010/02/28 23:45:06 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_fpu.c,v 1.1.2.2 2010/03/01 19:26:57 matt Exp $");
#include <sys/param.h>
#include <sys/mutex.h>
@@ -42,10 +42,14 @@
#include <mips/regnum.h>
#ifndef NOFPU
-kmutex_t fp_mutex __aligned(32);
+static struct {
+ kmutex_t fpx_mutex;
#ifdef MULTIPROCESSOR
-kcondvar_t fp_cv __aligned(32);
+ kcondvar_t fpx_cv;
#endif
+} fp_lockinfo __aligned(COHERENCY_UNIT);
+#define fp_mutex fp_lockinfo.fpx_mutex
+#define fp_cv fp_lockinfo.fpx_cv
#endif /* !NOFPU */
void
