Module Name: src
Committed By: cliff
Date: Fri Jan 7 00:17:22 UTC 2011
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_cpu.c
Log Message:
- ifdef out guts of cpu_xls616_erratum(); the problem is still unknown.
- cpu_rmixl_hatch() calls cpucore_rmixl_hatch()
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/sys/arch/mips/rmi/rmixl_cpu.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/rmi/rmixl_cpu.c
diff -u src/sys/arch/mips/rmi/rmixl_cpu.c:1.1.2.15 src/sys/arch/mips/rmi/rmixl_cpu.c:1.1.2.16
--- src/sys/arch/mips/rmi/rmixl_cpu.c:1.1.2.15 Mon Sep 20 19:39:10 2010
+++ src/sys/arch/mips/rmi/rmixl_cpu.c Fri Jan 7 00:17:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpu.c,v 1.1.2.15 2010/09/20 19:39:10 cliff Exp $ */
+/* $NetBSD: rmixl_cpu.c,v 1.1.2.16 2011/01/07 00:17:22 cliff Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -38,7 +38,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.1.2.15 2010/09/20 19:39:10 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.1.2.16 2011/01/07 00:17:22 cliff Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -106,6 +106,7 @@
static inline bool
cpu_xls616_erratum(device_t parent, struct cpucore_attach_args *ca)
{
+#if 0
if (mips_options.mips_cpu->cpu_pid == MIPS_XLS616) {
if (ca->ca_thread > 0) {
aprint_error_dev(parent, "XLS616 CLOCK ERRATUM: "
@@ -113,6 +114,7 @@
return true;
}
}
+#endif
return false;
}
@@ -263,6 +265,7 @@
void
cpu_rmixl_hatch(struct cpu_info *ci)
{
+ struct rmixl_cpu_softc * const sc = (void *)ci->ci_softc;
extern void rmixl_spl_init_cpu(void);
rmixl_spl_init_cpu(); /* spl initialization for this CPU */
@@ -276,8 +279,7 @@
KASSERT(curcpu() == ci);
#endif
- if (RMIXL_CPU_THREAD(ci->ci_cpuid) == 0)
- rmixl_fmn_init_core();
+ cpucore_rmixl_hatch(device_parent(sc->sc_dev));
}
static int
