Module Name: src
Committed By: thorpej
Date: Sat Sep 19 03:02:07 UTC 2020
Modified Files:
src/sys/arch/alpha/alpha: interrupt.c
src/sys/arch/alpha/include: types.h
Log Message:
Enable __HAVE_FAST_SOFTINTS and garbage-collect the #ifdefs.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/alpha/alpha/interrupt.c
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/alpha/include/types.h
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/alpha/alpha/interrupt.c
diff -u src/sys/arch/alpha/alpha/interrupt.c:1.87 src/sys/arch/alpha/alpha/interrupt.c:1.88
--- src/sys/arch/alpha/alpha/interrupt.c:1.87 Sat Sep 19 01:24:31 2020
+++ src/sys/arch/alpha/alpha/interrupt.c Sat Sep 19 03:02:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: interrupt.c,v 1.87 2020/09/19 01:24:31 thorpej Exp $ */
+/* $NetBSD: interrupt.c,v 1.88 2020/09/19 03:02:07 thorpej Exp $ */
/*-
* Copyright (c) 2000, 2001 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
#include <sys/cdefs.h> /* RCS ID & Copyright macro defns */
-__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.87 2020/09/19 01:24:31 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: interrupt.c,v 1.88 2020/09/19 03:02:07 thorpej Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -460,8 +460,6 @@ badaddr_read(void *addr, size_t size, vo
#define SOFTINTS_ELIGIBLE(ipl) \
((ALPHA_ALL_SOFTINTS << ((ipl) << 1)) & ALPHA_ALL_SOFTINTS)
-#ifdef __HAVE_FAST_SOFTINTS
-
/* Validate some assumptions the code makes. */
__CTASSERT(SOFTINT_TO_IPL(SOFTINT_CLOCK) == ALPHA_PSL_IPL_SOFT_LO);
__CTASSERT(SOFTINT_TO_IPL(SOFTINT_BIO) == ALPHA_PSL_IPL_SOFT_LO);
@@ -516,17 +514,6 @@ softint_init_md(lwp_t * const l, u_int c
*machdep = si_bit;
}
-#else /* ! __HAVE_FAST_SOFTINTS */
-
-/* Temporary stub for alpha_softint_switchto(). */
-void
-softint_dispatch(struct lwp * const pinned __unused, int const s __unused)
-{
- panic("softint_dispatch");
-}
-
-#endif /* __HAVE_FAST_SOFTINTS */
-
/*
* Helper macro.
*
@@ -552,7 +539,6 @@ softint_dispatch(struct lwp * const pinn
void
alpha_softint_dispatch(int const ipl)
{
-#ifdef __HAVE_FAST_SOFTINTS
struct lwp * const l = curlwp;
struct cpu_info * const ci = l->l_cpu;
unsigned long ssir;
@@ -570,12 +556,8 @@ alpha_softint_dispatch(int const ipl)
DOSOFTINT(BIO);
DOSOFTINT(CLOCK);
}
-#else
- panic("alpha_softint_dispatch");
-#endif /* __HAVE_FAST_SOFTINTS */
}
-
/*
* spllower:
*
Index: src/sys/arch/alpha/include/types.h
diff -u src/sys/arch/alpha/include/types.h:1.58 src/sys/arch/alpha/include/types.h:1.59
--- src/sys/arch/alpha/include/types.h:1.58 Wed Sep 16 04:07:32 2020
+++ src/sys/arch/alpha/include/types.h Sat Sep 19 03:02:07 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: types.h,v 1.58 2020/09/16 04:07:32 thorpej Exp $ */
+/* $NetBSD: types.h,v 1.59 2020/09/19 03:02:07 thorpej Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -78,7 +78,7 @@ typedef __register_t register_t;
#define __HAVE_MM_MD_DIRECT_MAPPED_IO
#define __HAVE_MM_MD_DIRECT_MAPPED_PHYS
#define __HAVE_CPU_DATA_FIRST
-/* #define __HAVE_FAST_SOFTINTS -- not yet */
+#define __HAVE_FAST_SOFTINTS
#define __HAVE_CPU_UAREA_ROUTINES
#define __HAVE_CPU_LWP_SETPRIVATE
#define __HAVE___LWP_GETPRIVATE_FAST
