diff options
| author | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2006-12-20 22:48:30 +0000 |
|---|---|---|
| committer | Gordon Willem Klok <gwk@cvs.openbsd.org> | 2006-12-20 22:48:30 +0000 |
| commit | 642587430f1b76aad136bb9679ead945e92ed3d5 (patch) | |
| tree | bad5cbd6d34aee259ce974416cd37d94bcf1f2de | |
| parent | bd6f2dfaeb041b8b08884a3a4787bba4033d046e (diff) | |
Decalre extern int cpuspeed in sys/arch/amd64/include/cpu.h like cpuspeed
is declared in the equivalent file on i386 and delete the repeticious
declarations already scattered in a few places.
Thanks to Will Backman for letting me test this on his machine,
ok mk@
| -rw-r--r-- | sys/arch/amd64/amd64/powernow-k8.c | 3 | ||||
| -rw-r--r-- | sys/arch/amd64/include/cpu.h | 4 | ||||
| -rw-r--r-- | sys/dev/acpi/acpicpu.c | 3 |
3 files changed, 4 insertions, 6 deletions
diff --git a/sys/arch/amd64/amd64/powernow-k8.c b/sys/arch/amd64/amd64/powernow-k8.c index 04d8cf8c123..5a09a52c554 100644 --- a/sys/arch/amd64/amd64/powernow-k8.c +++ b/sys/arch/amd64/amd64/powernow-k8.c @@ -1,4 +1,4 @@ -/* $OpenBSD: powernow-k8.c,v 1.14 2006/12/12 23:14:27 dim Exp $ */ +/* $OpenBSD: powernow-k8.c,v 1.15 2006/12/20 22:48:29 gwk Exp $ */ /* * Copyright (c) 2004 Martin Végiard. * Copyright (c) 2004-2005 Bruno Ducrot @@ -42,7 +42,6 @@ #define BIOS_START 0xe0000 #define BIOS_LEN 0x20000 -extern int cpuspeed; extern int setperf_prio; /* diff --git a/sys/arch/amd64/include/cpu.h b/sys/arch/amd64/include/cpu.h index 5b23973b361..af11a651b00 100644 --- a/sys/arch/amd64/include/cpu.h +++ b/sys/arch/amd64/include/cpu.h @@ -1,4 +1,4 @@ -/* $OpenBSD: cpu.h,v 1.21 2006/12/12 23:14:27 dim Exp $ */ +/* $OpenBSD: cpu.h,v 1.22 2006/12/20 22:48:29 gwk Exp $ */ /* $NetBSD: cpu.h,v 1.1 2003/04/26 18:39:39 fvdl Exp $ */ /*- @@ -253,9 +253,9 @@ extern int cpu_ecxfeature; extern int cpu_id; extern char cpu_vendor[]; extern int cpuid_level; +extern int cpuspeed; /* identcpu.c */ - void identifycpu(struct cpu_info *); int cpu_amd64speed(int *); void cpu_probe_features(struct cpu_info *); diff --git a/sys/dev/acpi/acpicpu.c b/sys/dev/acpi/acpicpu.c index 3398c148c6d..94bd165fcc4 100644 --- a/sys/dev/acpi/acpicpu.c +++ b/sys/dev/acpi/acpicpu.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpicpu.c,v 1.14 2006/12/20 17:50:40 gwk Exp $ */ +/* $OpenBSD: acpicpu.c,v 1.15 2006/12/20 22:48:29 gwk Exp $ */ /* * Copyright (c) 2005 Marco Peereboom <marco@openbsd.org> * @@ -72,7 +72,6 @@ extern int setperf_prio; #ifdef __i386__ struct acpicpu_softc *acpicpu_sc[I386_MAXPROCS]; #elif __amd64__ -extern int cpuspeed; struct acpicpu_softc *acpicpu_sc[X86_MAXPROCS]; #endif |