[src/trunk]: src/sys/arch/sparc/sparc Make KRUPS kernel buildable again

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

details:   https://anonhg.NetBSD.org/src/rev/813462871c53
branches:  trunk
changeset: 780626:813462871c53
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Jul 31 16:38:37 2012 +0000

description:
Make KRUPS kernel buildable again

diffstat:

 sys/arch/sparc/sparc/cpu.c          |  14 ++++++++------
 sys/arch/sparc/sparc/timer_msiiep.c |   5 +++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diffs (85 lines):

diff -r 9a91e265075e -r 813462871c53 sys/arch/sparc/sparc/cpu.c
--- a/sys/arch/sparc/sparc/cpu.c        Tue Jul 31 15:59:57 2012 +0000
+++ b/sys/arch/sparc/sparc/cpu.c        Tue Jul 31 16:38:37 2012 +0000
@@ -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 @@
 #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 @@
 }
 #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 @@
        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 @@
        { 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 },
diff -r 9a91e265075e -r 813462871c53 sys/arch/sparc/sparc/timer_msiiep.c
--- a/sys/arch/sparc/sparc/timer_msiiep.c       Tue Jul 31 15:59:57 2012 +0000
+++ b/sys/arch/sparc/sparc/timer_msiiep.c       Tue Jul 31 16:38:37 2012 +0000
@@ -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     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  };