 @@ -1,14 +1,14 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.8 2010/08/09 13:41:39 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.9 2010/08/09 15:46:17 jruoho Exp $ */
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruohonen@iki.fi>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
+ *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -17,46 +17,47 @@
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.8 2010/08/09 13:41:39 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.9 2010/08/09 15:46:17 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/bus.h>
 #include <sys/kcore.h>
 #include <sys/sysctl.h>
 #include <sys/xcall.h>
 #include <x86/cpu.h>
 #include <x86/cpufunc.h>
 #include <x86/cputypes.h>
 #include <x86/cpuvar.h>
 #include <x86/cpu_msr.h>
 #include <x86/machdep.h>
 #include <dev/acpi/acpica.h>
 #include <dev/acpi/acpi_cpu.h>
 static char	  native_idle_text[16];
 void		(*native_idle)(void) = NULL;
 void		(*native_cpu_freq_init)(int) = NULL;
 static int	 acpicpu_md_pstate_sysctl_get(SYSCTLFN_PROTO);
 static int	 acpicpu_md_pstate_sysctl_set(SYSCTLFN_PROTO);
 static int	 acpicpu_md_pstate_sysctl_all(SYSCTLFN_PROTO);
 extern uint32_t cpus_running;
 extern struct acpicpu_softc **acpicpu_sc;
 uint32_t
 acpicpu_md_cap(void)
+{
 	struct cpu_info *ci = curcpu();
 	uint32_t val = 0;
 @@ -195,60 +196,136 @@ acpicpu_md_idle_enter(int method, int st
 		if (__predict_false(ci->ci_want_resched) != 0) {
 			x86_enable_intr();
 			return;
+		}
 		x86_stihlt();
 		break;
+	}
+}
 int
 acpicpu_md_pstate_start(void)
+{
 	const struct sysctlnode	*fnode, *mnode, *rnode;
 	const char *str;
 	int rv;
-	cpu_freq_sysctl_get = acpicpu_md_pstate_sysctl_get;
+	switch (cpu_vendor) {
 	cpu_freq_sysctl_set = acpicpu_md_pstate_sysctl_set;
-	cpu_freq_sysctl_all = acpicpu_md_pstate_sysctl_all;
+	case CPUVENDOR_INTEL:
 		str = "est";
 		break;
 	default:
 		return ENODEV;
+	}
 	/*
 	 * A kludge for backwards compatibility.
 	 */
 	native_cpu_freq_init = cpu_freq_init;
 	if (cpu_freq_sysctllog != NULL) {
 		sysctl_teardown(&cpu_freq_sysctllog);
 		cpu_freq_sysctllog = NULL;
+	}
 	rv = sysctl_createv(&cpu_freq_sysctllog, 0, NULL, &rnode,
 	    CTLFLAG_PERMANENT, CTLTYPE_NODE, "machdep", NULL,
 	    NULL, 0, NULL, 0, CTL_MACHDEP, CTL_EOL);
 	if (rv != 0)
 		goto fail;
 	rv = sysctl_createv(&cpu_freq_sysctllog, 0, &rnode, &mnode,
 , CTLTYPE_NODE, str, NULL,
 	    NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL);
 	if (rv != 0)
 		goto fail;
 	rv = sysctl_createv(&cpu_freq_sysctllog, 0, &mnode, &fnode,
 , CTLTYPE_NODE, "frequency", NULL,
 	    NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL);
 	if (rv != 0)
 		goto fail;
 	rv = sysctl_createv(&cpu_freq_sysctllog, 0, &fnode, &rnode,
 	    CTLFLAG_READWRITE, CTLTYPE_INT, "target", NULL,
 	    acpicpu_md_pstate_sysctl_set, 0, NULL, 0, CTL_CREATE, CTL_EOL);
 	if (rv != 0)
 		goto fail;
 	rv = sysctl_createv(&cpu_freq_sysctllog, 0, &fnode, &rnode,
 	    CTLFLAG_READONLY, CTLTYPE_INT, "current", NULL,
 	    acpicpu_md_pstate_sysctl_get, 0, NULL, 0, CTL_CREATE, CTL_EOL);
 	if (rv != 0)
 		goto fail;
 	rv = sysctl_createv(&cpu_freq_sysctllog, 0, &fnode, &rnode,
 	    CTLFLAG_READONLY, CTLTYPE_STRING, "available", NULL,
 	    acpicpu_md_pstate_sysctl_all, 0, NULL, 0, CTL_CREATE, CTL_EOL);
 	if (rv != 0)
 		goto fail;
 	return 0;
 fail:
 	if (cpu_freq_sysctllog != NULL) {
 		sysctl_teardown(&cpu_freq_sysctllog);
 		cpu_freq_sysctllog = NULL;
+	}
 	if (native_cpu_freq_init != NULL)
 		(*native_cpu_freq_init)(cpu_vendor);
 	return rv;
+}
 int
 acpicpu_md_pstate_stop(void)
+{
-	cpu_freq_sysctl_get = NULL;
+	if (cpu_freq_sysctllog != NULL) {
-	cpu_freq_sysctl_set = NULL;
+		sysctl_teardown(&cpu_freq_sysctllog);
-	cpu_freq_sysctl_all = NULL;
+		cpu_freq_sysctllog = NULL;
+	}
 	if (native_cpu_freq_init != NULL)
 		(*native_cpu_freq_init)(cpu_vendor);
 	return 0;
+}
 static int
 acpicpu_md_pstate_sysctl_get(SYSCTLFN_ARGS)
+{
 	struct cpu_info *ci = curcpu();
 	struct acpicpu_softc *sc;
 	struct sysctlnode node;
 	uint32_t freq;
 	int err;
 	/*
 	 * We can use any ACPI CPU to manipulate the
 	 * frequencies. In MP environments all CPUs
 	 * are mandated to support the same number of
 	 * P-states and each state must have identical
-	 * parameters across CPUs.
+	 * parameters across processors.
 	 */
 	sc = acpicpu_sc[ci->ci_acpiid];
 	if (sc == NULL)
 		return ENXIO;
 	err = acpicpu_pstate_get(sc, &freq);
 	if (err != 0)
 		return err;
 	node = *rnode;
 	node.sysctl_data = &freq;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.75 2010/08/09 04:18:48 jruoho Exp $	*/
+/*	$NetBSD: cpu.c,v 1.76 2010/08/09 15:46:17 jruoho Exp $	*/
 /*-
  * Copyright (c) 2000, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Bill Sommerfeld of RedBack Networks Inc, and by Andrew Doran.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -52,27 +52,27 @@
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR AND CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.75 2010/08/09 04:18:48 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.76 2010/08/09 15:46:17 jruoho Exp $");
 #include "opt_ddb.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_mtrr.h"
 #include "lapic.h"
 #include "ioapic.h"
 #ifdef i386
 #include "npx.h"
 #endif
 #include <sys/param.h>
 @@ -175,29 +175,28 @@ uint32_t cpu_feature[5]; /* X86 CPUID fe
 			  *	[1] basic features %ecx
 			  *	[2] extended features %edx
 			  *	[3] extended features %ecx
 			  *	[4] VIA padlock features
 			  */
 extern char x86_64_doubleflt_stack[];
 bool x86_mp_online;
 paddr_t mp_trampoline_paddr = MP_TRAMPOLINE;
 static vaddr_t cmos_data_mapping;
 struct cpu_info *cpu_starting;
-int (*cpu_freq_sysctl_get)(SYSCTLFN_PROTO) = NULL;
+void (*cpu_freq_init)(int) = NULL;
-int (*cpu_freq_sysctl_set)(SYSCTLFN_PROTO) = NULL;
+struct sysctllog *cpu_freq_sysctllog = NULL;
 int (*cpu_freq_sysctl_all)(SYSCTLFN_PROTO) = NULL;
 void    	cpu_hatch(void *);
 static void    	cpu_boot_secondary(struct cpu_info *ci);
 static void    	cpu_start_secondary(struct cpu_info *ci);
 static void	cpu_copy_trampoline(void);
 /*
  * Runs once per boot once multiprocessor goo has been detected and
  * the local APIC on the boot processor has been mapped.
+ *
  * Called from lapic_boot_init() (from mpbios_scan()).
  */
 void

 @@ -1,14 +1,14 @@
-/*	$NetBSD: est.c,v 1.17 2010/08/09 04:18:49 jruoho Exp $	*/
+/*	$NetBSD: est.c,v 1.18 2010/08/09 15:46:17 jruoho Exp $	*/
 /*
  * Copyright (c) 2003 Michael Eriksson.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. The name of the author may not be used to endorse or promote products
 @@ -71,27 +71,27 @@
  *   Table 3-4, 3-5, 3-6, Voltage and Current Specifications.
  *   http://www.intel.com/design/mobile/datashts/302189.htm
+ *
  * - Linux cpufreq patches, speedstep-centrino.c.
  *   Encoding of MSR_PERF_CTL and MSR_PERF_STATUS.
  *   http://www.codemonkey.org.uk/projects/cpufreq/cpufreq-2.4.22-pre6-1.gz
+ *
  *   ACPI objects: _PCT is MSR location, _PSS is freq/voltage, _PPC is caps.
  */
 /* #define EST_DEBUG */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.17 2010/08/09 04:18:49 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: est.c,v 1.18 2010/08/09 15:46:17 jruoho Exp $");
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/device.h>
 #include <sys/malloc.h>
 #include <sys/sysctl.h>
 #include <sys/once.h>
 #include <sys/xcall.h>
 #include <x86/cpuvar.h>
 #include <x86/cputypes.h>
 #include <x86/cpu_msr.h>
 @@ -988,92 +988,41 @@ static const struct fqlist est_cpus[] =
 	ENTRY(IDT, BUS133, C7M_795),
 	ENTRY(IDT, BUS100, eden90_1000)
 };
 #define MSR2FREQINC(msr)	(((int) (msr) >> 8) & 0xff)
 #define MSR2VOLTINC(msr)	((int) (msr) & 0xff)
 #define MSR2MHZ(msr, bus)	((MSR2FREQINC((msr)) * (bus) + 50) / 100)
 #define MSR2MV(msr)		(MSR2VOLTINC(msr) * 16 + 700)
 static const struct 	fqlist *est_fqlist;	/* not NULL if functional */
 static uint16_t		*fake_table;		/* guessed est_cpu table */
 static char		*freq_names;
 static struct fqlist    fake_fqlist;
 static int 		est_node_target, est_node_current;
 static const char 	est_desc[] = "Enhanced SpeedStep";
 static int		lvendor, bus_clock;
 static int		est_sysctl_helper(SYSCTLFN_PROTO);
 static int		est_init_once(void);
 static void		est_init_main(int);
 static int		est_sysctl_helper(SYSCTLFN_PROTO);
 static int		est_sysctl_helper_get(SYSCTLFN_PROTO);
 static int		est_sysctl_helper_set(SYSCTLFN_PROTO);
 static int		est_sysctl_helper_all(SYSCTLFN_PROTO);
 static int
 est_sysctl_helper_get(SYSCTLFN_ARGS)
 	if (cpu_freq_sysctl_get != NULL)
 		return (*cpu_freq_sysctl_get)(SYSCTLFN_CALL(rnode));
 	return est_sysctl_helper(SYSCTLFN_CALL(rnode));
 static int
 est_sysctl_helper_set(SYSCTLFN_ARGS)
 	if (cpu_freq_sysctl_set != NULL)
 		return (*cpu_freq_sysctl_set)(SYSCTLFN_CALL(rnode));
 	return est_sysctl_helper(SYSCTLFN_CALL(rnode));
 static int
 est_sysctl_helper_all(SYSCTLFN_ARGS)
 	struct sysctlnode node;
 	int err;
 	if (cpu_freq_sysctl_all != NULL)
 		return (*cpu_freq_sysctl_all)(SYSCTLFN_CALL(rnode));
 	if (freq_names == NULL)
 		return ENXIO;
 	node = *rnode;
 	node.sysctl_data = freq_names;
 	err = sysctl_lookup(SYSCTLFN_CALL(&node));
 	if (err != 0 || newp == NULL)
 		return err;
 	return 0;
 static int
 est_sysctl_helper(SYSCTLFN_ARGS)
+{
 	struct sysctlnode	node;
 	int			fq, oldfq, error;
 	if (freq_names == NULL)
 		return ENXIO;
 	if (est_fqlist == NULL)
 		return EOPNOTSUPP;
 	node = *rnode;
 	node.sysctl_data = &fq;
 	oldfq = 0;
 	if (rnode->sysctl_num == est_node_target)
 		fq = oldfq = MSR2MHZ(rdmsr(MSR_PERF_CTL), bus_clock);
 	else if (rnode->sysctl_num == est_node_current)
 		fq = MSR2MHZ(rdmsr(MSR_PERF_STATUS), bus_clock);
 	else
 		return EOPNOTSUPP;
 @@ -1127,26 +1076,27 @@ est_init(int vendor)
 static void
 est_init_main(int vendor)
+{
 #ifdef __i386__
 	const struct fqlist	*fql;
 #endif
 	const struct sysctlnode	*node, *estnode, *freqnode;
 	uint64_t		msr;
 	uint16_t		cur, idhi, idlo;
 	uint8_t			crhi, crlo, crcur;
 	int			i, mv, rc;
 	size_t			len, freq_len;
 	char			*freq_names;
 	if (CPUID2FAMILY(curcpu()->ci_signature) == 15)
 		bus_clock = p4_get_bus_clock(curcpu());
 	else if (CPUID2FAMILY(curcpu()->ci_signature) == 6) {
 		if (vendor == CPUVENDOR_IDT) {
 			switch (CPUID2MODEL(curcpu()->ci_signature)) {
 			case 0xa: /* C7 Esther */
 			case 0xd: /* C7 Esther */
 				bus_clock = viac7_get_bus_clock(curcpu());
 				break;
 			default:
 				bus_clock = via_get_bus_clock(curcpu());
 				break;
 @@ -1301,55 +1251,64 @@ est_init_main(int vendor)
 	len = 0;
 	for (i = 0; i < est_fqlist->n; i++) {
 		len += snprintf(freq_names + len, freq_len - len, "%d%s",
 		    MSR2MHZ(est_fqlist->table[i], bus_clock),
 		    i < est_fqlist->n - 1 ? " " : "");
+	}
 	aprint_debug_dev(curcpu()->ci_dev, "%s (%d mV) ", est_desc, mv);
 	aprint_debug("%d (MHz): %s\n", MSR2MHZ(msr, bus_clock), freq_names);
 	/*
 	 * Setup the sysctl sub-tree machdep.est.*
 	 */
-	if ((rc = sysctl_createv(NULL, 0, NULL, &node,
+	if (cpu_freq_sysctllog != NULL) {
 		rc = EALREADY;
 		goto err;
+	}
 	cpu_freq_init = est_init_main;
 	if ((rc = sysctl_createv(&cpu_freq_sysctllog, 0, NULL, &node,
 	    CTLFLAG_PERMANENT, CTLTYPE_NODE, "machdep", NULL,
 	    NULL, 0, NULL, 0, CTL_MACHDEP, CTL_EOL)) != 0)
 		goto err;
-	if ((rc = sysctl_createv(NULL, 0, &node, &estnode,
+	if ((rc = sysctl_createv(&cpu_freq_sysctllog, 0, &node, &estnode,
 , CTLTYPE_NODE, "est", NULL,
 	    NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
 		goto err;
-	if ((rc = sysctl_createv(NULL, 0, &estnode, &freqnode,
+	if ((rc = sysctl_createv(&cpu_freq_sysctllog, 0, &estnode, &freqnode,
 , CTLTYPE_NODE, "frequency", NULL,
 	    NULL, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
 		goto err;
-	if ((rc = sysctl_createv(NULL, 0, &freqnode, &node,
+	if ((rc = sysctl_createv(&cpu_freq_sysctllog, 0, &freqnode, &node,
 	    EST_TARGET_CTLFLAG, CTLTYPE_INT, "target", NULL,
-	    est_sysctl_helper_set, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
+	    est_sysctl_helper, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
 		goto err;
 	est_node_target = node->sysctl_num;
-	if ((rc = sysctl_createv(NULL, 0, &freqnode, &node,
+	if ((rc = sysctl_createv(&cpu_freq_sysctllog, 0, &freqnode, &node,
 , CTLTYPE_INT, "current", NULL,
-	    est_sysctl_helper_get, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
+	    est_sysctl_helper, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
 		goto err;
 	est_node_current = node->sysctl_num;
-	if ((rc = sysctl_createv(NULL, 0, &freqnode, &node,
+	if ((rc = sysctl_createv(&cpu_freq_sysctllog, 0, &freqnode, &node,
 	    CTLFLAG_READONLY, CTLTYPE_STRING, "available", NULL,
-	    est_sysctl_helper_all, 0, NULL, 0, CTL_CREATE, CTL_EOL)) != 0)
+	    NULL, 0, freq_names, freq_len, CTL_CREATE, CTL_EOL)) != 0)
 		goto err;
 	return;
  err:
 	free(freq_names, M_SYSCTLDATA);
 	freq_names = NULL;
 	if (cpu_freq_sysctllog != NULL)
 		sysctl_teardown(&cpu_freq_sysctllog);
 	cpu_freq_init = NULL;
 	aprint_error("%s: sysctl_createv failed (rc = %d)\n", __func__, rc);
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: cpu.c,v 1.47 2010/07/24 00:45:56 jym Exp $	*/
+/*	$NetBSD: cpu.c,v 1.48 2010/08/09 15:46:18 jruoho Exp $	*/
 /* NetBSD: cpu.c,v 1.18 2004/02/20 17:35:01 yamt Exp  */
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
  * Copyright (c) 2002, 2006, 2007 YAMAMOTO Takashi,
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
 @@ -56,27 +56,27 @@
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR AND CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.47 2010/07/24 00:45:56 jym Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.48 2010/08/09 15:46:18 jruoho Exp $");
 #include "opt_ddb.h"
 #include "opt_multiprocessor.h"
 #include "opt_mpbios.h"		/* for MPDEBUG */
 #include "opt_mtrr.h"
 #include "opt_xen.h"
 #include "lapic.h"
 #include "ioapic.h"
 #include <sys/param.h>
 #include <sys/proc.h>
 #include <sys/systm.h>
 @@ -175,26 +175,29 @@ uint32_t phycpus_attached = 0;
 uint32_t phycpus_running = 0;
 uint32_t cpu_feature[5]; /* X86 CPUID feature bits
 			  *	[0] basic features %edx
 			  *	[1] basic features %ecx
 			  *	[2] extended features %edx
 			  *	[3] extended features %ecx
 			  *	[4] VIA padlock features
 			  */
 bool x86_mp_online;
 paddr_t mp_trampoline_paddr = MP_TRAMPOLINE;
 void (*cpu_freq_init)(int) = NULL;
 struct sysctllog *cpu_freq_sysctllog = NULL;
 #if defined(MULTIPROCESSOR)
 void    	cpu_hatch(void *);
 static void    	cpu_boot_secondary(struct cpu_info *ci);
 static void    	cpu_start_secondary(struct cpu_info *ci);
 static void	cpu_copy_trampoline(void);
 /*
  * Runs once per boot once multiprocessor goo has been detected and
  * the local APIC on the boot processor has been mapped.
+ *
  * Called from lapic_boot_init() (from mpbios_scan()).
  */
 void

 @@ -1,14 +1,14 @@
-/* 	$NetBSD: cpuvar.h,v 1.36 2010/08/09 04:18:48 jruoho Exp $ */
+/* 	$NetBSD: cpuvar.h,v 1.37 2010/08/09 15:46:17 jruoho Exp $ */
 /*-
  * Copyright (c) 2000, 2007 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by RedBack Networks Inc.
+ *
  * Author: Bill Sommerfeld
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -132,28 +132,27 @@ void coretemp_register(struct cpu_info *
 #ifdef INTEL_ONDEMAND_CLOCKMOD
 void clockmod_init(void);
 #endif
 #ifdef ENHANCED_SPEEDSTEP
 void	est_init(int);
 int	via_get_bus_clock(struct cpu_info *);
 int	viac7_get_bus_clock(struct cpu_info *);
 int	p3_get_bus_clock(struct cpu_info *);
 int	p4_get_bus_clock(struct cpu_info *);
 #endif
-extern int (*cpu_freq_sysctl_get)(SYSCTLFN_PROTO);
+extern void (*cpu_freq_init)(int);
-extern int (*cpu_freq_sysctl_set)(SYSCTLFN_PROTO);
+extern struct sysctllog *cpu_freq_sysctllog;
 extern int (*cpu_freq_sysctl_all)(SYSCTLFN_PROTO);
 void	cpu_get_tsc_freq(struct cpu_info *);
 void	pat_init(struct cpu_info *);
 extern int cpu_vendor;
 extern bool x86_mp_online;
 extern uint32_t cpu_feature[5];
 #endif /* _KERNEL */
 #endif /* !_X86_CPUVAR_H_ */