Module Name: src
Committed By: cliff
Date: Tue Feb 8 19:18:23 UTC 2011
Modified Files:
src/sys/arch/mips/include [matt-nb5-mips64]: db_machdep.h
src/sys/arch/mips/mips [matt-nb5-mips64]: cpu_subr.c db_interface.c
Log Message:
- rename ddb_running_on_this_cpu to ddb_running_on_this_cpu_p
according to pedicate unction naming style convention
To generate a diff of this commit:
cvs rdiff -u -r1.22.62.2 -r1.22.62.3 src/sys/arch/mips/include/db_machdep.h
cvs rdiff -u -r1.1.2.15 -r1.1.2.16 src/sys/arch/mips/mips/cpu_subr.c
cvs rdiff -u -r1.64.16.19 -r1.64.16.20 src/sys/arch/mips/mips/db_interface.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/include/db_machdep.h
diff -u src/sys/arch/mips/include/db_machdep.h:1.22.62.2 src/sys/arch/mips/include/db_machdep.h:1.22.62.3
--- src/sys/arch/mips/include/db_machdep.h:1.22.62.2 Sat Feb 5 06:04:59 2011
+++ src/sys/arch/mips/include/db_machdep.h Tue Feb 8 19:18:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_machdep.h,v 1.22.62.2 2011/02/05 06:04:59 cliff Exp $ */
+/* $NetBSD: db_machdep.h,v 1.22.62.3 2011/02/08 19:18:22 cliff Exp $ */
/*
* Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author)
@@ -113,7 +113,7 @@
db_addr_t branch_taken(int inst, db_addr_t pc, db_regs_t *regs);
db_addr_t next_instr_address(db_addr_t pc, bool bd);
-bool ddb_running_on_this_cpu(void);
+bool ddb_running_on_this_cpu_p(void);
bool ddb_running_on_any_cpu(void);
void db_resume_others(void);
#ifdef MIPS_DDB_WATCH
Index: src/sys/arch/mips/mips/cpu_subr.c
diff -u src/sys/arch/mips/mips/cpu_subr.c:1.1.2.15 src/sys/arch/mips/mips/cpu_subr.c:1.1.2.16
--- src/sys/arch/mips/mips/cpu_subr.c:1.1.2.15 Tue Feb 8 06:01:47 2011
+++ src/sys/arch/mips/mips/cpu_subr.c Tue Feb 8 19:18:22 2011
@@ -33,7 +33,7 @@
#include "opt_multiprocessor.h"
#include "opt_sa.h"
-__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.1.2.15 2011/02/08 06:01:47 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu_subr.c,v 1.1.2.16 2011/02/08 19:18:22 cliff Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -739,7 +739,7 @@
CPUSET_ADD(cpus_resumed, index);
#if defined(DDB)
- if (ddb_running_on_this_cpu())
+ if (ddb_running_on_this_cpu_p())
cpu_Debugger();
if (ddb_running_on_any_cpu())
continue;
Index: src/sys/arch/mips/mips/db_interface.c
diff -u src/sys/arch/mips/mips/db_interface.c:1.64.16.19 src/sys/arch/mips/mips/db_interface.c:1.64.16.20
--- src/sys/arch/mips/mips/db_interface.c:1.64.16.19 Sat Feb 5 06:07:07 2011
+++ src/sys/arch/mips/mips/db_interface.c Tue Feb 8 19:18:22 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.64.16.19 2011/02/05 06:07:07 cliff Exp $ */
+/* $NetBSD: db_interface.c,v 1.64.16.20 2011/02/08 19:18:22 cliff Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.64.16.19 2011/02/05 06:07:07 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.64.16.20 2011/02/08 19:18:22 cliff Exp $");
#include "opt_multiprocessor.h"
#include "opt_cputype.h" /* which mips CPUs do we support? */
@@ -109,8 +109,6 @@
void db_mtcr_cmd(db_expr_t, bool, db_expr_t, const char *);
#endif
-bool ddb_running_on_this_cpu(void);
-
static void kdbpoke_4(vaddr_t addr, int newval);
static void kdbpoke_2(vaddr_t addr, short newval);
static void kdbpoke_1(vaddr_t addr, char newval);
@@ -1081,7 +1079,7 @@
#ifdef MULTIPROCESSOR
bool
-ddb_running_on_this_cpu(void)
+ddb_running_on_this_cpu_p(void)
{
return ddb_cpu == cpu_index(curcpu());
}
