Module Name: src
Committed By: christos
Date: Sun Nov 10 00:50:13 UTC 2013
Modified Files:
src/sys/arch/alpha/include: cpu.h
src/sys/arch/ia64/include: cpu.h
src/sys/arch/mips/include: cpu.h
src/sys/arch/sparc64/include: cpu.h
src/sys/arch/vax/include: cpu.h
src/sys/arch/x86/include: cpu.h
Log Message:
use __unused instead of __USE and void cast to mark iterator variable unused
where needed (from phone)
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/alpha/include/cpu.h
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/include/cpu.h
cvs rdiff -u -r1.107 -r1.108 src/sys/arch/mips/include/cpu.h
cvs rdiff -u -r1.104 -r1.105 src/sys/arch/sparc64/include/cpu.h
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/vax/include/cpu.h
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x86/include/cpu.h
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/alpha/include/cpu.h
diff -u src/sys/arch/alpha/include/cpu.h:1.79 src/sys/arch/alpha/include/cpu.h:1.80
--- src/sys/arch/alpha/include/cpu.h:1.79 Sat Nov 2 21:12:16 2013
+++ src/sys/arch/alpha/include/cpu.h Sat Nov 9 19:50:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.79 2013/11/03 01:12:16 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.80 2013/11/10 00:50:13 christos Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001 The NetBSD Foundation, Inc.
@@ -146,9 +146,8 @@ struct cpu_info {
extern struct cpu_info cpu_info_primary;
extern struct cpu_info *cpu_info_list;
-#define CPU_INFO_ITERATOR int
-#define CPU_INFO_FOREACH(cii, ci) cii = 0, __USE(cii), \
- ci = cpu_info_list; \
+#define CPU_INFO_ITERATOR int __unused
+#define CPU_INFO_FOREACH(cii, ci) ci = cpu_info_list; \
ci != NULL; ci = ci->ci_next
#if defined(MULTIPROCESSOR)
Index: src/sys/arch/ia64/include/cpu.h
diff -u src/sys/arch/ia64/include/cpu.h:1.11 src/sys/arch/ia64/include/cpu.h:1.12
--- src/sys/arch/ia64/include/cpu.h:1.11 Sat Oct 19 15:20:59 2013
+++ src/sys/arch/ia64/include/cpu.h Sat Nov 9 19:50:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.11 2013/10/19 19:20:59 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.12 2013/11/10 00:50:13 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -117,8 +117,8 @@ struct cpu_info {
extern struct cpu_info cpu_info_primary;
extern struct cpu_info *cpu_info_list;
-#define CPU_INFO_ITERATOR int
-#define CPU_INFO_FOREACH(cii, ci) cii = 0, ci = cpu_info_list; \
+#define CPU_INFO_ITERATOR int __unused
+#define CPU_INFO_FOREACH(cii, ci) ci = cpu_info_list; \
ci != NULL; ci = ci->ci_next
#ifdef MULTIPROCESSOR
/*
Index: src/sys/arch/mips/include/cpu.h
diff -u src/sys/arch/mips/include/cpu.h:1.107 src/sys/arch/mips/include/cpu.h:1.108
--- src/sys/arch/mips/include/cpu.h:1.107 Thu Feb 28 07:44:38 2013
+++ src/sys/arch/mips/include/cpu.h Sat Nov 9 19:50:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.107 2013/02/28 12:44:38 macallan Exp $ */
+/* $NetBSD: cpu.h,v 1.108 2013/11/10 00:50:13 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -148,9 +148,9 @@ struct cpu_info {
};
-#define CPU_INFO_ITERATOR int
+#define CPU_INFO_ITERATOR int __UNUSED
#define CPU_INFO_FOREACH(cii, ci) \
- (void)(cii), ci = &cpu_info_store; ci != NULL; ci = ci->ci_next
+ ci = &cpu_info_store; ci != NULL; ci = ci->ci_next
#endif /* !_LOCORE */
#endif /* _KERNEL */
Index: src/sys/arch/sparc64/include/cpu.h
diff -u src/sys/arch/sparc64/include/cpu.h:1.104 src/sys/arch/sparc64/include/cpu.h:1.105
--- src/sys/arch/sparc64/include/cpu.h:1.104 Fri Sep 13 17:36:38 2013
+++ src/sys/arch/sparc64/include/cpu.h Sat Nov 9 19:50:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.104 2013/09/13 21:36:38 martin Exp $ */
+/* $NetBSD: cpu.h,v 1.105 2013/11/10 00:50:13 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -220,9 +220,8 @@ extern struct pool_cache *fpstate_cache;
#define cpu_number() (curcpu()->ci_index)
#define CPU_IS_PRIMARY(ci) ((ci)->ci_flags & CPUF_PRIMARY)
-#define CPU_INFO_ITERATOR int
-#define CPU_INFO_FOREACH(cii, ci) (void)cii, ci = cpus; ci != NULL; \
- ci = ci->ci_next
+#define CPU_INFO_ITERATOR int __unused
+#define CPU_INFO_FOREACH(cii, ci) ci = cpus; ci != NULL; ci = ci->ci_next
#define curlwp curcpu()->ci_curlwp
#define fplwp curcpu()->ci_fplwp
Index: src/sys/arch/vax/include/cpu.h
diff -u src/sys/arch/vax/include/cpu.h:1.97 src/sys/arch/vax/include/cpu.h:1.98
--- src/sys/arch/vax/include/cpu.h:1.97 Sat Nov 9 15:32:59 2013
+++ src/sys/arch/vax/include/cpu.h Sat Nov 9 19:50:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.97 2013/11/09 20:32:59 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.98 2013/11/10 00:50:13 christos Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden
@@ -185,9 +185,8 @@ cpu_intr_p(void)
#if defined(MULTIPROCESSOR)
#define CPU_IS_PRIMARY(ci) ((ci)->ci_flags & CI_MASTERCPU)
-#define CPU_INFO_ITERATOR int
-#define CPU_INFO_FOREACH(cii, ci) cii = 0, __USE(cii), \
- ci = SIMPLEQ_FIRST(&cpus); \
+#define CPU_INFO_ITERATOR int __unused
+#define CPU_INFO_FOREACH(cii, ci) ci = SIMPLEQ_FIRST(&cpus); \
ci != NULL; \
ci = SIMPLEQ_NEXT(ci, ci_next)
Index: src/sys/arch/x86/include/cpu.h
diff -u src/sys/arch/x86/include/cpu.h:1.56 src/sys/arch/x86/include/cpu.h:1.57
--- src/sys/arch/x86/include/cpu.h:1.56 Tue Nov 5 11:04:13 2013
+++ src/sys/arch/x86/include/cpu.h Sat Nov 9 19:50:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.56 2013/11/05 16:04:13 christos Exp $ */
+/* $NetBSD: cpu.h,v 1.57 2013/11/10 00:50:13 christos Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -284,9 +284,8 @@ struct cpu_info {
extern struct cpu_info cpu_info_primary;
extern struct cpu_info *cpu_info_list;
-#define CPU_INFO_ITERATOR int
-#define CPU_INFO_FOREACH(cii, ci) cii = 0, __USE(cii), \
- ci = cpu_info_list; \
+#define CPU_INFO_ITERATOR int __unused
+#define CPU_INFO_FOREACH(cii, ci) ci = cpu_info_list; \
ci != NULL; ci = ci->ci_next
#define CPU_STARTUP(_ci, _target) ((_ci)->ci_func->start(_ci, _target))
