Module Name: src
Committed By: martin
Date: Tue Jul 31 16:38:37 UTC 2012
Modified Files:
src/sys/arch/sparc/sparc: cpu.c timer_msiiep.c
Log Message:
Make KRUPS kernel buildable again
To generate a diff of this commit:
cvs rdiff -u -r1.236 -r1.237 src/sys/arch/sparc/sparc/cpu.c
cvs rdiff -u -r1.26 -r1.27 src/sys/arch/sparc/sparc/timer_msiiep.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/sparc/sparc/cpu.c
diff -u src/sys/arch/sparc/sparc/cpu.c:1.236 src/sys/arch/sparc/sparc/cpu.c:1.237
--- src/sys/arch/sparc/sparc/cpu.c:1.236 Sun Jul 29 00:04:05 2012
+++ src/sys/arch/sparc/sparc/cpu.c Tue Jul 31 16:38:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.236 2012/07/29 00:04:05 matt Exp $ */
+/* $NetBSD: cpu.c,v 1.237 2012/07/31 16:38:37 martin Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.236 2012/07/29 00:04:05 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.237 2012/07/31 16:38:37 martin Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@@ -1058,8 +1058,10 @@ int hypersparc_getmid(void);
#define cypress_getmid hypersparc_getmid
int viking_getmid(void);
+#if (defined(SUN4M) && !defined(MSIIEP)) || defined(SUN4D)
extern int (*moduleerr_handler)(void);
int viking_module_error(void);
+#endif
struct module_info module_unknown = {
CPUTYP_UNKNOWN,
@@ -1706,7 +1708,7 @@ turbosparc_hotfix(struct cpu_info *sc)
}
#endif /* SUN4M */
-#if defined(SUN4M)
+#if defined(SUN4M) && !defined(MSIIEP)
struct module_info module_viking = {
CPUTYP_UNKNOWN, /* set in cpumatch() */
VAC_NONE,
@@ -1733,9 +1735,9 @@ struct module_info module_viking = {
pmap_zero_page4m,
pmap_copy_page4m
};
-#endif /* SUN4M */
+#endif /* SUN4M && !defined(MSIIEP) */
-#if defined(SUN4M) || defined(SUN4D)
+#if (defined(SUN4M) && !defined(MSIIEP)) || defined(SUN4D)
void
cpumatch_viking(struct cpu_info *sc, struct module_info *mp, int node)
{
@@ -1953,7 +1955,7 @@ struct cpu_conf {
{ CPU_SUN4C, 9, 0, ANY, ANY, "W8601/8701 or MB86903", &module_sun4c },
#endif
-#if defined(SUN4M)
+#if defined(SUN4M) && !defined(MSIIEP)
{ CPU_SUN4M, 0, 4, 0, 4, "MB86904", &module_swift },
{ CPU_SUN4M, 0, 5, 0, 5, "MB86907", &module_turbosparc },
{ CPU_SUN4M, 1, 1, 1, 0, "CY7C601/604", &module_cypress },
Index: src/sys/arch/sparc/sparc/timer_msiiep.c
diff -u src/sys/arch/sparc/sparc/timer_msiiep.c:1.26 src/sys/arch/sparc/sparc/timer_msiiep.c:1.27
--- src/sys/arch/sparc/sparc/timer_msiiep.c:1.26 Sun Jul 17 23:18:23 2011
+++ src/sys/arch/sparc/sparc/timer_msiiep.c Tue Jul 31 16:38:37 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: timer_msiiep.c,v 1.26 2011/07/17 23:18:23 mrg Exp $ */
+/* $NetBSD: timer_msiiep.c,v 1.27 2012/07/31 16:38:37 martin Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -58,7 +58,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: timer_msiiep.c,v 1.26 2011/07/17 23:18:23 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: timer_msiiep.c,v 1.27 2012/07/31 16:38:37 martin Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -86,6 +86,7 @@ static int clockintr_msiiep(void *);
static int statintr_msiiep(void *);
static u_int timer_get_timecount(struct timecounter *);
+void* sched_cookie;
static struct intrhand level10 = { .ih_fun = clockintr_msiiep };
static struct intrhand level14 = { .ih_fun = statintr_msiiep };
