Deleted Added
full compact
ichss.c (142156) ichss.c (142203)
1/*-
2 * Copyright (c) 2004-2005 Nate Lawson (SDG)
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

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

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

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

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

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

209}
210
211static int
212ichss_probe(device_t dev)
213{
214 device_t est_dev, perf_dev;
215 int error, type;
216
29
30#include <sys/param.h>
31#include <sys/bus.h>
32#include <sys/cpu.h>
33#include <sys/kernel.h>
34#include <sys/malloc.h>
35#include <sys/module.h>
36#include <sys/pcpu.h>

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

209}
210
211static int
212ichss_probe(device_t dev)
213{
214 device_t est_dev, perf_dev;
215 int error, type;
216
217 if (resource_disabled("ichss", 0))
218 return (ENXIO);
219
217 /*
218 * If the ACPI perf driver has attached and is not just offering
219 * info, let it manage things. Also, if Enhanced SpeedStep is
220 * available, don't attach.
221 */
222 perf_dev = device_find_child(device_get_parent(dev), "acpi_perf", -1);
223 if (perf_dev && device_is_attached(perf_dev)) {
224 error = CPUFREQ_DRV_TYPE(perf_dev, &type);

--- 173 unchanged lines hidden ---
220 /*
221 * If the ACPI perf driver has attached and is not just offering
222 * info, let it manage things. Also, if Enhanced SpeedStep is
223 * available, don't attach.
224 */
225 perf_dev = device_find_child(device_get_parent(dev), "acpi_perf", -1);
226 if (perf_dev && device_is_attached(perf_dev)) {
227 error = CPUFREQ_DRV_TYPE(perf_dev, &type);

--- 173 unchanged lines hidden ---