This isn't functionally identical. In some cases a hint to disable

unit 0 would in fact disable all units.

This reverts r241856

Approved by: cperciva (implicit)

3 files changed, 9 insertions, 0 deletions

diff --git a/sys/x86/cpufreq/est.c b/sys/x86/cpufreq/est.c
index 41660cb..cc9502d 100644
--- a/sys/x86/cpufreq/est.c
+++ b/sys/x86/cpufreq/est.c
@@ -991,6 +991,9 @@ est_probe(device_t dev)
 	uint64_t msr;
 	int error, type;
 
+	if (resource_disabled("est", 0))
+		return (ENXIO);
+
 	/*
 	 * If the ACPI perf driver has attached and is not just offering
 	 * info, let it manage things.
diff --git a/sys/x86/cpufreq/p4tcc.c b/sys/x86/cpufreq/p4tcc.c
index 4e37def..e11b4a8 100644
--- a/sys/x86/cpufreq/p4tcc.c
+++ b/sys/x86/cpufreq/p4tcc.c
@@ -139,6 +139,10 @@ p4tcc_identify(driver_t *driver, device_t parent)
 static int
 p4tcc_probe(device_t dev)
 {
+
+	if (resource_disabled("p4tcc", 0))
+		return (ENXIO);
+
 	device_set_desc(dev, "CPU Frequency Thermal Control");
 	return (0);
 }
diff --git a/sys/x86/isa/elcr.c b/sys/x86/isa/elcr.c
index ec457bc..266d783 100644
--- a/sys/x86/isa/elcr.c
+++ b/sys/x86/isa/elcr.c
@@ -84,6 +84,8 @@ elcr_probe(void)
 				printf("  E");
 		printf("\n");
 	}
+	if (resource_disabled("elcr", 0))
+		return (ENXIO);
 	elcr_found = 1;
 	return (0);
 }