diff options
-rw-r--r-- | sys/arch/i386/i386/est.c | 4 | ||||
-rw-r--r-- | sys/arch/i386/i386/machdep.c | 3 | ||||
-rw-r--r-- | sys/arch/i386/i386/p4tcc.c | 4 | ||||
-rw-r--r-- | sys/arch/i386/pci/pcib.c | 4 | ||||
-rw-r--r-- | sys/kern/kern_sysctl.c | 3 | ||||
-rw-r--r-- | sys/sys/sysctl.h | 3 |
6 files changed, 13 insertions, 8 deletions
diff --git a/sys/arch/i386/i386/est.c b/sys/arch/i386/i386/est.c index b543ea4f7f7..ecf505efce2 100644 --- a/sys/arch/i386/i386/est.c +++ b/sys/arch/i386/i386/est.c @@ -1,4 +1,4 @@ -/* $OpenBSD: est.c,v 1.6 2004/02/27 21:15:45 grange Exp $ */ +/* $OpenBSD: est.c,v 1.7 2004/02/27 21:46:44 grange Exp $ */ /* * Copyright (c) 2003 Michael Eriksson. * All rights reserved. @@ -191,6 +191,8 @@ static const struct est_cpu est_cpus[] = { static const struct fqlist *est_fqlist; +extern int setperf_prio; + void est_init(const char *cpu_device) { diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 4adf2fbb11e..1b227149c41 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.283 2004/02/27 21:07:48 grange Exp $ */ +/* $OpenBSD: machdep.c,v 1.284 2004/02/27 21:46:44 grange Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -252,6 +252,7 @@ struct vm_map *phys_map = NULL; int kbd_reset; int p4_model; +int setperf_prio = 0; /* for concurrent handlers */ /* * Extent maps to manage I/O and ISA memory hole space. Allocate diff --git a/sys/arch/i386/i386/p4tcc.c b/sys/arch/i386/i386/p4tcc.c index 3e0c3b41795..c1d7eb13c85 100644 --- a/sys/arch/i386/i386/p4tcc.c +++ b/sys/arch/i386/i386/p4tcc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: p4tcc.c,v 1.3 2004/02/27 21:15:45 grange Exp $ */ +/* $OpenBSD: p4tcc.c,v 1.4 2004/02/27 21:46:44 grange Exp $ */ /* * Copyright (c) 2003 Ted Unangst * All rights reserved. @@ -59,6 +59,8 @@ static struct { #define TCC_LEVELS sizeof(tcc) / sizeof(tcc[0]) +extern int setperf_prio; + void p4tcc_init(int model, int step) { diff --git a/sys/arch/i386/pci/pcib.c b/sys/arch/i386/pci/pcib.c index 2dc4c12138f..38a13ed68a6 100644 --- a/sys/arch/i386/pci/pcib.c +++ b/sys/arch/i386/pci/pcib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pcib.c,v 1.13 2004/02/27 21:15:45 grange Exp $ */ +/* $OpenBSD: pcib.c,v 1.14 2004/02/27 21:46:44 grange Exp $ */ /* $NetBSD: pcib.c,v 1.6 1997/06/06 23:29:16 thorpej Exp $ */ /*- @@ -84,6 +84,8 @@ struct cfdriver pcib_cd = { NULL, "pcib", DV_DULL }; +extern int setperf_prio; + int pcibmatch(parent, match, aux) struct device *parent; diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index b1521a30465..a49859fc5ca 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_sysctl.c,v 1.102 2004/02/27 21:15:45 grange Exp $ */ +/* $OpenBSD: kern_sysctl.c,v 1.103 2004/02/27 21:46:44 grange Exp $ */ /* $NetBSD: kern_sysctl.c,v 1.17 1996/05/20 17:49:05 mrg Exp $ */ /*- @@ -98,7 +98,6 @@ int sysctl_emul(int *, u_int, void *, size_t *, void *, size_t); int (*cpu_cpuspeed)(int *); int (*cpu_setperf)(int); -int setperf_prio = 0; /* for concurrent handlers */ /* * Lock to avoid too many processes vslocking a large amount of memory diff --git a/sys/sys/sysctl.h b/sys/sys/sysctl.h index a4fe6a574b6..32bb152664b 100644 --- a/sys/sys/sysctl.h +++ b/sys/sys/sysctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: sysctl.h,v 1.75 2004/02/27 21:15:45 grange Exp $ */ +/* $OpenBSD: sysctl.h,v 1.76 2004/02/27 21:46:44 grange Exp $ */ /* $NetBSD: sysctl.h,v 1.16 1996/04/09 20:55:36 cgd Exp $ */ /* @@ -680,7 +680,6 @@ int sysctl_wdog(int *, u_int, void *, size_t *, void *, size_t); extern int (*cpu_cpuspeed)(int *); extern int (*cpu_setperf)(int); -extern int setperf_prio; int bpf_sysctl(int *, u_int, void *, size_t *, void *, size_t); |