diff options
| author | Artur Grabowski <art@cvs.openbsd.org> | 2004-06-20 03:04:16 +0000 |
|---|---|---|
| committer | Artur Grabowski <art@cvs.openbsd.org> | 2004-06-20 03:04:16 +0000 |
| commit | e0b871ce397c75d61de51634bad62251e907c370 (patch) | |
| tree | 5daee173339f1a9d14e93e903c86af0375c7bef7 | |
| parent | 102b0caf009d92d7bebc79f853cee1ce690ed333 (diff) | |
Another merge error from smp branch.
Found by otto@drijf.net
deraadt@ ok
| -rw-r--r-- | sys/kern/kern_sysctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 720f65900c1..818bad2654c 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.113 2004/06/16 18:14:12 deraadt Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.114 2004/06/20 03:04:15 art Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -429,7 +429,7 @@ kern_sysctl(name, namelen, oldp, oldlenp, newp, newlen, p) return (sysctl_malloc(name + 1, namelen - 1, oldp, oldlenp, newp, newlen, p)); case KERN_CPTIME: -#ifdef MULTIPROCESSOR +#ifdef __HAVE_CPUINFO { CPU_INFO_ITERATOR cii; struct cpu_info *ci; |