Module Name: src
Committed By: matt
Date: Sat Feb 6 00:39:47 UTC 2010
Modified Files:
src/sys/arch/mips/mips [matt-nb5-mips64]: genassym.cf locore.S
mips_softint.c
Log Message:
Allow __HAVE_FAST_SOFTINTS to be optional
To generate a diff of this commit:
cvs rdiff -u -r1.44.12.14 -r1.44.12.15 src/sys/arch/mips/mips/genassym.cf
cvs rdiff -u -r1.167.38.9 -r1.167.38.10 src/sys/arch/mips/mips/locore.S
cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/sys/arch/mips/mips/mips_softint.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/genassym.cf
diff -u src/sys/arch/mips/mips/genassym.cf:1.44.12.14 src/sys/arch/mips/mips/genassym.cf:1.44.12.15
--- src/sys/arch/mips/mips/genassym.cf:1.44.12.14 Fri Feb 5 07:36:50 2010
+++ src/sys/arch/mips/mips/genassym.cf Sat Feb 6 00:39:47 2010
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.44.12.14 2010/02/05 07:36:50 matt Exp $
+# $NetBSD: genassym.cf,v 1.44.12.15 2010/02/06 00:39:47 matt Exp $
#
# Copyright (c) 1992, 1993
# The Regents of the University of California. All rights reserved.
@@ -89,6 +89,10 @@
include <mips/pte.h>
include <mips/locore.h>
+ifdef __HAVE_FAST_SOFTINTS
+define __HAVE_FAST_SOFTINTS 1
+endif
+
define PAGE_SIZE PAGE_SIZE
define MIPS_KSEG0_START MIPS_KSEG0_START
define MIPS_KSEG1_START MIPS_KSEG1_START
Index: src/sys/arch/mips/mips/locore.S
diff -u src/sys/arch/mips/mips/locore.S:1.167.38.9 src/sys/arch/mips/mips/locore.S:1.167.38.10
--- src/sys/arch/mips/mips/locore.S:1.167.38.9 Fri Feb 5 07:36:50 2010
+++ src/sys/arch/mips/mips/locore.S Sat Feb 6 00:39:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.167.38.9 2010/02/05 07:36:50 matt Exp $ */
+/* $NetBSD: locore.S,v 1.167.38.10 2010/02/06 00:39:46 matt Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -262,6 +262,7 @@
nop
END(cpu_switchto)
+#ifdef __HAVE_FAST_SOFTINTS
/*
* void softint_fast_dispatch(struct lwp *l, int s, void *new_sp);
*
@@ -271,7 +272,7 @@
softint_cleanup:
PTR_L t0, L_CPU(MIPS_CURLWP)
INT_L t1, CPU_INFO_MTX_COUNT(t0)
- addi t1, t1, 1
+ INT_ADDU t1, 1
INT_S t1, CPU_INFO_MTX_COUNT(t0)
REG_L ra, CALLFRAME_RA(sp)
PTR_S zero, L_CTXSWITCH(MIPS_CURLWP)
@@ -351,6 +352,7 @@
j ra
PTR_ADDU sp, CALLFRAME_SIZ
END(softint_fast_dispatch)
+#endif /* __HAVE_FAST_SOFTINTS */
/*
* savectx(struct user *up)
Index: src/sys/arch/mips/mips/mips_softint.c
diff -u src/sys/arch/mips/mips/mips_softint.c:1.1.2.1 src/sys/arch/mips/mips/mips_softint.c:1.1.2.2
--- src/sys/arch/mips/mips/mips_softint.c:1.1.2.1 Fri Feb 5 07:36:50 2010
+++ src/sys/arch/mips/mips/mips_softint.c Sat Feb 6 00:39:47 2010
@@ -29,7 +29,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: mips_softint.c,v 1.1.2.1 2010/02/05 07:36:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_softint.c,v 1.1.2.2 2010/02/06 00:39:47 matt Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -42,6 +42,8 @@
#include <mips/locore.h>
+#ifdef __HAVE_FAST_SOFTINTS
+
#define SOFTINT_BIO_MASK (1 << SOFTINT_BIO)
#define SOFTINT_CLOCK_MASK (1 << SOFTINT_CLOCK)
#define SOFTINT_NET_MASK (1 << SOFTINT_NET)
@@ -140,3 +142,5 @@
_clrsoftintr(ipending);
splx(s);
}
+
+#endif /* __HAVE_FAST_SOFTINTS */
