Deleted Added
full compact
est.c (241856) est.c (241885)
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/x86/cpufreq/est.c 241856 2012-10-22 03:41:14Z eadler $");
29__FBSDID("$FreeBSD: head/sys/x86/cpufreq/est.c 241885 2012-10-22 13:06:09Z eadler $");
30
31#include <sys/param.h>
32#include <sys/bus.h>
33#include <sys/cpu.h>
34#include <sys/kernel.h>
35#include <sys/malloc.h>
36#include <sys/module.h>
37#include <sys/smp.h>

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

986
987static int
988est_probe(device_t dev)
989{
990 device_t perf_dev;
991 uint64_t msr;
992 int error, type;
993
30
31#include <sys/param.h>
32#include <sys/bus.h>
33#include <sys/cpu.h>
34#include <sys/kernel.h>
35#include <sys/malloc.h>
36#include <sys/module.h>
37#include <sys/smp.h>

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

986
987static int
988est_probe(device_t dev)
989{
990 device_t perf_dev;
991 uint64_t msr;
992 int error, type;
993
994 if (resource_disabled("est", 0))
995 return (ENXIO);
996
994 /*
995 * If the ACPI perf driver has attached and is not just offering
996 * info, let it manage things.
997 */
998 perf_dev = device_find_child(device_get_parent(dev), "acpi_perf", -1);
999 if (perf_dev && device_is_attached(perf_dev)) {
1000 error = CPUFREQ_DRV_TYPE(perf_dev, &type);
1001 if (error == 0 && (type & CPUFREQ_FLAG_INFO_ONLY) == 0)

--- 398 unchanged lines hidden ---
997 /*
998 * If the ACPI perf driver has attached and is not just offering
999 * info, let it manage things.
1000 */
1001 perf_dev = device_find_child(device_get_parent(dev), "acpi_perf", -1);
1002 if (perf_dev && device_is_attached(perf_dev)) {
1003 error = CPUFREQ_DRV_TYPE(perf_dev, &type);
1004 if (error == 0 && (type & CPUFREQ_FLAG_INFO_ONLY) == 0)

--- 398 unchanged lines hidden ---