Module Name: src
Committed By: mrg
Date: Tue Feb 15 09:05:15 UTC 2011
Modified Files:
src/sys/arch/sparc/sparc: cpu.c cpuvar.h intr.c
Log Message:
remove unused CPUFLG_READY and CPU_NOTREADY() macro.
To generate a diff of this commit:
cvs rdiff -u -r1.229 -r1.230 src/sys/arch/sparc/sparc/cpu.c
cvs rdiff -u -r1.87 -r1.88 src/sys/arch/sparc/sparc/cpuvar.h
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/sparc/sparc/intr.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.229 src/sys/arch/sparc/sparc/cpu.c:1.230
--- src/sys/arch/sparc/sparc/cpu.c:1.229 Mon Feb 14 03:18:10 2011
+++ src/sys/arch/sparc/sparc/cpu.c Tue Feb 15 09:05:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.c,v 1.229 2011/02/14 03:18:10 mrg Exp $ */
+/* $NetBSD: cpu.c,v 1.230 2011/02/15 09:05:14 mrg Exp $ */
/*
* Copyright (c) 1996
@@ -52,7 +52,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.229 2011/02/14 03:18:10 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.230 2011/02/15 09:05:14 mrg Exp $");
#include "opt_multiprocessor.h"
#include "opt_lockdebug.h"
@@ -555,12 +555,10 @@
continue;
printf(" cpu%d", cpi->ci_cpuid);
- cpi->flags |= CPUFLG_READY;
cpu_ready_mask |= (1 << n);
}
/* Mark the boot CPU as ready */
- cpuinfo.flags |= CPUFLG_READY;
cpu_ready_mask |= (1 << 0);
/* Tell the other CPU's to start up. */
Index: src/sys/arch/sparc/sparc/cpuvar.h
diff -u src/sys/arch/sparc/sparc/cpuvar.h:1.87 src/sys/arch/sparc/sparc/cpuvar.h:1.88
--- src/sys/arch/sparc/sparc/cpuvar.h:1.87 Mon Feb 14 03:18:10 2011
+++ src/sys/arch/sparc/sparc/cpuvar.h Tue Feb 15 09:05:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuvar.h,v 1.87 2011/02/14 03:18:10 mrg Exp $ */
+/* $NetBSD: cpuvar.h,v 1.88 2011/02/15 09:05:14 mrg Exp $ */
/*
* Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -419,7 +419,6 @@
#define CPUFLG_HATCHED 0x1000 /* CPU is alive */
#define CPUFLG_PAUSED 0x2000 /* CPU is paused */
#define CPUFLG_GOTMSG 0x4000 /* CPU got an lev13 IPI */
-#define CPUFLG_READY 0x8000 /* CPU available for IPI */
#define CPU_INFO_ITERATOR int
@@ -435,11 +434,6 @@
#define CPU_INFO_FOREACH(cii, cp) cii = 0, cp = curcpu(); cp != NULL; cp = NULL
#endif
-/*
- * Useful macros.
- */
-#define CPU_NOTREADY(cpi) ((cpi) == NULL || cpuinfo.mid == (cpi)->mid || \
- ((cpi)->flags & CPUFLG_READY) == 0)
/*
* Related function prototypes
Index: src/sys/arch/sparc/sparc/intr.c
diff -u src/sys/arch/sparc/sparc/intr.c:1.111 src/sys/arch/sparc/sparc/intr.c:1.112
--- src/sys/arch/sparc/sparc/intr.c:1.111 Thu Jan 27 06:24:59 2011
+++ src/sys/arch/sparc/sparc/intr.c Tue Feb 15 09:05:14 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.c,v 1.111 2011/01/27 06:24:59 mrg Exp $ */
+/* $NetBSD: intr.c,v 1.112 2011/02/15 09:05:14 mrg Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.111 2011/01/27 06:24:59 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr.c,v 1.112 2011/02/15 09:05:14 mrg Exp $");
#include "opt_multiprocessor.h"
#include "opt_sparc_arch.h"
@@ -305,7 +305,6 @@
case OPENPROM_MBX_WD:
/* In case there's an xcall in progress (unlikely) */
spl0();
- cpuinfo.flags &= ~CPUFLG_READY;
#ifdef MULTIPROCESSOR
cpu_ready_mask &= ~(1 << cpu_number());
#endif
