Module Name: src
Committed By: cliff
Date: Mon Sep 20 19:39:10 UTC 2010
Modified Files:
src/sys/arch/mips/rmi [matt-nb5-mips64]: rmixl_cpu.c
Log Message:
- remove MULTIPROCESSOR condition for rmixl_cpuinfo_print and
rmixl_cpu_data_print functions, so we can call them
e.g. from ddb in non-MP kernels
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.14 -r1.1.2.15 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.14 src/sys/arch/mips/rmi/rmixl_cpu.c:1.1.2.15
--- src/sys/arch/mips/rmi/rmixl_cpu.c:1.1.2.14 Wed Sep 1 00:59:43 2010
+++ src/sys/arch/mips/rmi/rmixl_cpu.c Mon Sep 20 19:39:10 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_cpu.c,v 1.1.2.14 2010/09/01 00:59:43 matt Exp $ */
+/* $NetBSD: rmixl_cpu.c,v 1.1.2.15 2010/09/20 19:39:10 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.14 2010/09/01 00:59:43 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rmixl_cpu.c,v 1.1.2.15 2010/09/20 19:39:10 cliff Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -76,12 +76,13 @@
#endif
static int cpu_setup_trampoline_common(struct cpu_info *, struct rmixl_cpu_trampoline_args *);
static void cpu_setup_trampoline_callback(struct cpu_info *);
+#endif /* MULTIPROCESSOR */
+
#ifdef DEBUG
void rmixl_cpu_data_print(struct cpu_data *);
struct cpu_info *
rmixl_cpuinfo_print(cpuid_t);
#endif /* DEBUG */
-#endif /* MULTIPROCESSOR */
CFATTACH_DECL_NEW(cpu_rmixl, sizeof(struct rmixl_cpu_softc),
cpu_rmixl_match, cpu_rmixl_attach, NULL, NULL);
@@ -354,6 +355,7 @@
rmixlfw_wakeup_cpu(rmixl_cpu_trampoline, (void *)ta,
(uint64_t)1 << ci->ci_cpuid, wakeup_cpu);
}
+#endif /* MULTIPROCESSOR */
#ifdef DEBUG
@@ -439,4 +441,3 @@
}
#endif /* DEBUG */
-#endif /* MULTIPROCESSOR */
