Deleted Added
full compact
est.c (142140) est.c (142203)
1/*-
2 * Copyright (c) 2004 Colin Percival
3 * Copyright (c) 2005 Nate Lawson
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted providing that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
23 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
24 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25 * POSSIBILITY OF SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
1/*-
2 * Copyright (c) 2004 Colin Percival
3 * Copyright (c) 2005 Nate Lawson
4 * All rights reserved.
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted providing that the following conditions
8 * are met:

--- 12 unchanged lines hidden (view full) ---

21 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
22 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
23 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
24 * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
25 * POSSIBILITY OF SUCH DAMAGE.
26 */
27
28#include <sys/cdefs.h>
29__FBSDID("$FreeBSD: head/sys/i386/cpufreq/est.c 142140 2005-02-20 20:27:59Z njl $");
29__FBSDID("$FreeBSD: head/sys/i386/cpufreq/est.c 142203 2005-02-22 06:31:45Z njl $");
30
31#include <sys/param.h>
32#include <sys/bus.h>
33#include <sys/cpu.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/smp.h>
37#include <sys/systm.h>

--- 550 unchanged lines hidden (view full) ---

588
589static int
590est_probe(device_t dev)
591{
592 const freq_info *f;
593 device_t perf_dev;
594 uint64_t msr;
595 int error, type;
30
31#include <sys/param.h>
32#include <sys/bus.h>
33#include <sys/cpu.h>
34#include <sys/kernel.h>
35#include <sys/module.h>
36#include <sys/smp.h>
37#include <sys/systm.h>

--- 550 unchanged lines hidden (view full) ---

588
589static int
590est_probe(device_t dev)
591{
592 const freq_info *f;
593 device_t perf_dev;
594 uint64_t msr;
595 int error, type;
596
597 if (resource_disabled("est", 0))
598 return (ENXIO);
596
597 /*
598 * If the ACPI perf driver has attached and is not just offering
599 * info, let it manage things.
600 */
601 perf_dev = device_find_child(device_get_parent(dev), "acpi_perf", -1);
602 if (perf_dev && device_is_attached(perf_dev)) {
603 error = CPUFREQ_DRV_TYPE(perf_dev, &type);

--- 182 unchanged lines hidden ---
599
600 /*
601 * If the ACPI perf driver has attached and is not just offering
602 * info, let it manage things.
603 */
604 perf_dev = device_find_child(device_get_parent(dev), "acpi_perf", -1);
605 if (perf_dev && device_is_attached(perf_dev)) {
606 error = CPUFREQ_DRV_TYPE(perf_dev, &type);

--- 182 unchanged lines hidden ---