Module Name: src
Committed By: christos
Date: Sat Oct 19 19:21:00 UTC 2013
Modified Files:
src/sys/arch/amiga/include: cpu.h
src/sys/arch/atari/include: cpu.h
src/sys/arch/cesfic/include: cpu.h
src/sys/arch/hp300/include: cpu.h
src/sys/arch/ia64/include: cpu.h
src/sys/arch/luna68k/include: cpu.h
src/sys/arch/mac68k/include: cpu.h
src/sys/arch/mvme68k/include: cpu.h
src/sys/arch/news68k/include: cpu.h
src/sys/arch/next68k/include: cpu.h
src/sys/arch/sh3/include: cpu.h
src/sys/arch/sparc/include: cpu.h
src/sys/arch/sun68k/include: cpu.h
src/sys/arch/vax/include: cpu.h
src/sys/arch/x68k/include: cpu.h
Log Message:
make cpu_need_resched() macros consistent; __USE flags
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/sys/arch/amiga/include/cpu.h
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/atari/include/cpu.h
cvs rdiff -u -r1.28 -r1.29 src/sys/arch/cesfic/include/cpu.h
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/hp300/include/cpu.h
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/ia64/include/cpu.h
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/luna68k/include/cpu.h
cvs rdiff -u -r1.97 -r1.98 src/sys/arch/mac68k/include/cpu.h
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/mvme68k/include/cpu.h
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/news68k/include/cpu.h
cvs rdiff -u -r1.46 -r1.47 src/sys/arch/next68k/include/cpu.h
cvs rdiff -u -r1.55 -r1.56 src/sys/arch/sh3/include/cpu.h
cvs rdiff -u -r1.94 -r1.95 src/sys/arch/sparc/include/cpu.h
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/sun68k/include/cpu.h
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/vax/include/cpu.h
cvs rdiff -u -r1.56 -r1.57 src/sys/arch/x68k/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/amiga/include/cpu.h
diff -u src/sys/arch/amiga/include/cpu.h:1.79 src/sys/arch/amiga/include/cpu.h:1.80
--- src/sys/arch/amiga/include/cpu.h:1.79 Mon May 16 09:22:52 2011
+++ src/sys/arch/amiga/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.79 2011/05/16 13:22:52 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.80 2013/10/19 19:20:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -77,7 +77,11 @@ struct clockframe {
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
*/
-#define cpu_need_resched(ci,flags) {ci->ci_want_resched = 1; setsoftast();}
+#define cpu_need_resched(ci,flags) do { \
+ __USE(flags); \
+ ci->ci_want_resched = 1; \
+ setsoftast(); \
+} while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process from the softclock
Index: src/sys/arch/atari/include/cpu.h
diff -u src/sys/arch/atari/include/cpu.h:1.69 src/sys/arch/atari/include/cpu.h:1.70
--- src/sys/arch/atari/include/cpu.h:1.69 Thu Feb 2 11:59:42 2012
+++ src/sys/arch/atari/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.69 2012/02/02 16:59:42 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.70 2013/10/19 19:20:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -85,7 +85,11 @@ struct clockframe {
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
*/
-#define cpu_need_resched(ci,flags) {ci->ci_want_resched = 1; setsoftast();}
+#define cpu_need_resched(ci,flags) do { \
+ __USE(flags); \
+ ci->ci_want_resched = 1; \
+ setsoftast(); \
+} while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process from the softclock
Index: src/sys/arch/cesfic/include/cpu.h
diff -u src/sys/arch/cesfic/include/cpu.h:1.28 src/sys/arch/cesfic/include/cpu.h:1.29
--- src/sys/arch/cesfic/include/cpu.h:1.28 Thu Feb 2 11:59:42 2012
+++ src/sys/arch/cesfic/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.28 2012/02/02 16:59:42 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.29 2013/10/19 19:20:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -79,8 +79,11 @@ struct clockframe {
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
*/
-#define cpu_need_resched(ci, flags) \
- do { ci->ci_want_resched = 1; aston(); } while (/* CONSTCOND */0)
+#define cpu_need_resched(ci,flags) do { \
+ __USE(flags); \
+ ci->ci_want_resched = 1; \
+ aston(); \
+} while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process when the user profiling
Index: src/sys/arch/hp300/include/cpu.h
diff -u src/sys/arch/hp300/include/cpu.h:1.67 src/sys/arch/hp300/include/cpu.h:1.68
--- src/sys/arch/hp300/include/cpu.h:1.67 Thu Feb 2 11:59:42 2012
+++ src/sys/arch/hp300/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.67 2012/02/02 16:59:42 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.68 2013/10/19 19:20:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -88,8 +88,11 @@ struct clockframe {
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
*/
-#define cpu_need_resched(ci, flags) \
- do { ci->ci_want_resched = 1; aston(); } while (/* CONSTCOND */0)
+#define cpu_need_resched(ci,flags) do { \
+ __USE(flags); \
+ ci->ci_want_resched = 1; \
+ aston(); \
+} while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process when the user profiling
Index: src/sys/arch/ia64/include/cpu.h
diff -u src/sys/arch/ia64/include/cpu.h:1.10 src/sys/arch/ia64/include/cpu.h:1.11
--- src/sys/arch/ia64/include/cpu.h:1.10 Sat Oct 1 11:59:28 2011
+++ src/sys/arch/ia64/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.10 2011/10/01 15:59:28 chs Exp $ */
+/* $NetBSD: cpu.h,v 1.11 2013/10/19 19:20:59 christos Exp $ */
/*-
* Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -163,8 +163,10 @@ struct clockframe {
#define cpu_signotify(l) aston(l)
// void cpu_need_resched(struct cpu_info *ci, int flags)
-#define cpu_need_resched(ci, f) do { \
-} while(0)
+#define cpu_need_resched(ci, f) do { \
+ __USE(ci); \
+ __USE(f); \
+} while(/*CONSTCOND*/0)
#define setsoftclock() /*XXX: FIXME */
Index: src/sys/arch/luna68k/include/cpu.h
diff -u src/sys/arch/luna68k/include/cpu.h:1.31 src/sys/arch/luna68k/include/cpu.h:1.32
--- src/sys/arch/luna68k/include/cpu.h:1.31 Thu Feb 2 11:59:42 2012
+++ src/sys/arch/luna68k/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.31 2012/02/02 16:59:42 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.32 2013/10/19 19:20:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -80,7 +80,11 @@ struct clockframe {
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
*/
-#define cpu_need_resched(ci,flags) { ci->ci_want_resched = 1; aston(); }
+#define cpu_need_resched(ci,flags) do { \
+ __USE(flags); \
+ ci->ci_want_resched = 1; \
+ aston(); \
+} while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process when the user profiling
Index: src/sys/arch/mac68k/include/cpu.h
diff -u src/sys/arch/mac68k/include/cpu.h:1.97 src/sys/arch/mac68k/include/cpu.h:1.98
--- src/sys/arch/mac68k/include/cpu.h:1.97 Thu Feb 2 11:59:43 2012
+++ src/sys/arch/mac68k/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.97 2012/02/02 16:59:43 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.98 2013/10/19 19:20:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -99,7 +99,11 @@ struct clockframe {
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
*/
-#define cpu_need_resched(ci, v) { ci->ci_want_resched++; aston(); }
+#define cpu_need_resched(ci,flags) do { \
+ __USE(flags); \
+ ci->ci_want_resched = 1; \
+ aston(); \
+} while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process from the softclock
Index: src/sys/arch/mvme68k/include/cpu.h
diff -u src/sys/arch/mvme68k/include/cpu.h:1.47 src/sys/arch/mvme68k/include/cpu.h:1.48
--- src/sys/arch/mvme68k/include/cpu.h:1.47 Thu Feb 2 11:59:43 2012
+++ src/sys/arch/mvme68k/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.47 2012/02/02 16:59:43 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.48 2013/10/19 19:20:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -86,8 +86,11 @@ extern volatile unsigned int interrupt_d
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
*/
-#define cpu_need_resched(ci, flags) \
- do { ci->ci_want_resched++; aston(); } while (/* CONSTCOND */0)
+#define cpu_need_resched(ci,flags) do { \
+ __USE(flags); \
+ ci->ci_want_resched = 1; \
+ aston(); \
+} while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process when the user profiling
Index: src/sys/arch/news68k/include/cpu.h
diff -u src/sys/arch/news68k/include/cpu.h:1.41 src/sys/arch/news68k/include/cpu.h:1.42
--- src/sys/arch/news68k/include/cpu.h:1.41 Thu Feb 2 11:59:43 2012
+++ src/sys/arch/news68k/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.41 2012/02/02 16:59:43 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.42 2013/10/19 19:20:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -104,8 +104,11 @@ struct clockframe {
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
*/
-#define cpu_need_resched(ci, flags) \
- do { ci->ci_want_resched = 1; aston(); } while (/* CONSTCOND */0)
+#define cpu_need_resched(ci,flags) do { \
+ __USE(flags); \
+ ci->ci_want_resched = 1; \
+ aston(); \
+} while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process when the user profiling
Index: src/sys/arch/next68k/include/cpu.h
diff -u src/sys/arch/next68k/include/cpu.h:1.46 src/sys/arch/next68k/include/cpu.h:1.47
--- src/sys/arch/next68k/include/cpu.h:1.46 Thu Feb 2 11:59:43 2012
+++ src/sys/arch/next68k/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.46 2012/02/02 16:59:43 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.47 2013/10/19 19:20:59 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -90,8 +90,11 @@ extern volatile unsigned int interrupt_d
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
*/
-#define cpu_need_resched(ci, flags) \
- do { ci->ci_want_resched = 1; aston(); } while (/* CONSTCOND */0)
+#define cpu_need_resched(ci,flags) do { \
+ __USE(flags); \
+ ci->ci_want_resched = 1; \
+ aston(); \
+} while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process when the user profiling
Index: src/sys/arch/sh3/include/cpu.h
diff -u src/sys/arch/sh3/include/cpu.h:1.55 src/sys/arch/sh3/include/cpu.h:1.56
--- src/sys/arch/sh3/include/cpu.h:1.55 Tue Dec 21 22:22:43 2010
+++ src/sys/arch/sh3/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.55 2010/12/22 03:22:43 nisimura Exp $ */
+/* $NetBSD: cpu.h,v 1.56 2013/10/19 19:20:59 christos Exp $ */
/*-
* Copyright (c) 2002 The NetBSD Foundation, Inc. All rights reserved.
@@ -101,6 +101,7 @@ struct clockframe {
*/
#define cpu_need_resched(ci, flags) \
do { \
+ __USE(flags); \
ci->ci_want_resched = 1; \
if (curlwp != ci->ci_data.cpu_idlelwp) \
aston(curlwp); \
Index: src/sys/arch/sparc/include/cpu.h
diff -u src/sys/arch/sparc/include/cpu.h:1.94 src/sys/arch/sparc/include/cpu.h:1.95
--- src/sys/arch/sparc/include/cpu.h:1.94 Tue May 1 05:40:15 2012
+++ src/sys/arch/sparc/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.94 2012/05/01 09:40:15 martin Exp $ */
+/* $NetBSD: cpu.h,v 1.95 2013/10/19 19:20:59 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -118,6 +118,7 @@ void sparc_softintr_init(void);
* user mode, or after the current trap/syscall if in system mode.
*/
#define cpu_need_resched(ci, flags) do { \
+ __USE(flags); \
(ci)->ci_want_resched = 1; \
(ci)->ci_want_ast = 1; \
\
Index: src/sys/arch/sun68k/include/cpu.h
diff -u src/sys/arch/sun68k/include/cpu.h:1.22 src/sys/arch/sun68k/include/cpu.h:1.23
--- src/sys/arch/sun68k/include/cpu.h:1.22 Tue Dec 21 21:42:29 2010
+++ src/sys/arch/sun68k/include/cpu.h Sat Oct 19 15:20:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.22 2010/12/22 02:42:29 matt Exp $ */
+/* $NetBSD: cpu.h,v 1.23 2013/10/19 19:20:59 christos Exp $ */
/*
* Copyright (c) 1982, 1990 The Regents of the University of California.
@@ -132,8 +132,11 @@ extern int astpending; /* need to trap
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
*/
-#define cpu_need_resched(ci, flags) \
- do { ci->ci_want_resched = 1; aston(); } while (/* CONSTCOND */0)
+#define cpu_need_resched(ci,flags) do { \
+ __USE(flags); \
+ ci->ci_want_resched = 1; \
+ aston(); \
+} while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process when the user profiling
Index: src/sys/arch/vax/include/cpu.h
diff -u src/sys/arch/vax/include/cpu.h:1.95 src/sys/arch/vax/include/cpu.h:1.96
--- src/sys/arch/vax/include/cpu.h:1.95 Sat Oct 27 13:18:13 2012
+++ src/sys/arch/vax/include/cpu.h Sat Oct 19 15:21:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.95 2012/10/27 17:18:13 chs Exp $ */
+/* $NetBSD: cpu.h,v 1.96 2013/10/19 19:21:00 christos Exp $ */
/*
* Copyright (c) 1994 Ludd, University of Lule}, Sweden
@@ -158,6 +158,7 @@ extern int cpu_printfataltraps;
#define cpu_number() (curcpu()->ci_cpuid)
#define cpu_need_resched(ci, flags) \
do { \
+ __USE(flags); \
(ci)->ci_want_resched = 1; \
mtpr(AST_OK,PR_ASTLVL); \
} while (/*CONSTCOND*/ 0)
Index: src/sys/arch/x68k/include/cpu.h
diff -u src/sys/arch/x68k/include/cpu.h:1.56 src/sys/arch/x68k/include/cpu.h:1.57
--- src/sys/arch/x68k/include/cpu.h:1.56 Thu Feb 2 11:59:43 2012
+++ src/sys/arch/x68k/include/cpu.h Sat Oct 19 15:21:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.56 2012/02/02 16:59:43 tsutsui Exp $ */
+/* $NetBSD: cpu.h,v 1.57 2013/10/19 19:21:00 christos Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@@ -88,8 +88,11 @@ struct clockframe {
* Preempt the current process if in interrupt from user mode,
* or after the current trap/syscall if in system mode.
*/
-#define cpu_need_resched(ci, flags) \
- do { (ci)->ci_want_resched = 1; aston(); } while (/* CONSTCOND */ 0)
+#define cpu_need_resched(ci,flags) do { \
+ __USE(flags); \
+ ci->ci_want_resched = 1; \
+ aston(); \
+} while (/*CONSTCOND*/0)
/*
* Give a profiling tick to the current process when the user profiling
