diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-09-20 23:01:07 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2005-09-20 23:01:07 +0000 |
| commit | 8ec10aafe97eb6e76b394512c2e6b5d1cfcdc13d (patch) | |
| tree | 61e7fcad601cbfea2788b9abdd78f07215d57713 /sys | |
| parent | dab14b4db0846344b96d59b21fb17b0ba7f16df1 (diff) | |
unbreak tree, how did you do that miod
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/amd64/include/cpu.h | 6 | ||||
| -rw-r--r-- | sys/arch/hppa64/include/cpu.h | 4 | ||||
| -rw-r--r-- | sys/arch/i386/include/cpu.h | 6 | ||||
| -rw-r--r-- | sys/kern/kern_sysctl.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h index 2a40ff5ff3c..f5b9a201917 100644 --- a/sys/arch/amd64/include/cpu.h +++ b/sys/arch/amd64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.14 2005/09/20 21:04:13 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.15 2005/09/20 23:00:34 deraadt Exp $ */ /* $NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $ */ /*- @@ -141,8 +141,8 @@ 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) for (cii = 0, ci = cpu_info_list; \ - ci != NULL; ci = ci->ci_next) +#define CPU_INFO_FOREACH(cii, ci) cii = 0, ci = cpu_info_list; \ + ci != NULL; ci = ci->ci_next #define CPU_INFO_UNIT(ci) ((ci)->ci_dev->dv_unit) diff --git a/sys/arch/hppa64/include/cpu.h b/sys/arch/hppa64/include/cpu.h index 51478cfa4aa..a8d83bfdbbc 100644 --- a/sys/arch/hppa64/include/cpu.h +++ b/sys/arch/hppa64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.6 2005/09/20 21:04:14 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.7 2005/09/20 23:00:34 deraadt Exp $ */ /* * Copyright (c) 2005 Michael Shalayeff @@ -142,7 +142,7 @@ struct cpu_info *curcpu(void); #define CPU_IS_PRIMARY(ci) ((ci)->ci_number == 0) #define CPU_INFO_ITERATOR int #define CPU_INFO_FOREACH(cii,ci) \ - for (cii = 0, ci = curcpu(); ci != NULL; ci = ci->ci_next) + cii = 0, ci = curcpu(); ci != NULL; ci = ci->ci_next #define CPU_INFO_UNIT(ci) ((ci)->ci_number) #ifdef DIAGNOSTIC diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h index 89d555048de..156c7268ed9 100644 --- a/sys/arch/i386/include/cpu.h +++ b/sys/arch/i386/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.69 2005/09/20 21:04:15 miod Exp $ */ +/* $OpenBSD: cpu.h,v 1.70 2005/09/20 23:00:34 deraadt Exp $ */ /* $NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $ */ /*- @@ -167,8 +167,8 @@ 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) for (cii = 0, ci = cpu_info_list; \ - ci != NULL; ci = ci->ci_next) +#define CPU_INFO_FOREACH(cii, ci) cii = 0, ci = cpu_info_list; \ + ci != NULL; ci = ci->ci_next #define CPU_INFO_UNIT(ci) ((ci)->ci_dev.dv_unit) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 71671ff75b5..0457c18241c 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.129 2005/09/20 21:04:15 miod Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.130 2005/09/20 23:01:06 deraadt Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -460,7 +460,7 @@ kern_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) bzero(cp_time, sizeof(cp_time)); - CPU_INFO_FOREACH(cii, ci) { + for (CPU_INFO_FOREACH(cii, ci)) { for (i = 0; i < CPUSTATES; i++) cp_time[i] += ci->ci_schedstate.spc_cp_time[i]; } @@ -1902,7 +1902,7 @@ sysctl_cptime2(int *name, u_int namelen, void *oldp, size_t *oldlenp, i = name[0]; - CPU_INFO_FOREACH(cii, ci) { + for (CPU_INFO_FOREACH(cii, ci)) { if (i-- == 0) break; } |