diff options
-rw-r--r-- | sys/amd64/amd64/tsc.c | 7 | ||||
-rw-r--r-- | sys/amd64/isa/clock.c | 7 | ||||
-rw-r--r-- | sys/i386/i386/tsc.c | 7 | ||||
-rw-r--r-- | sys/i386/isa/clock.c | 7 | ||||
-rw-r--r-- | sys/isa/atrtc.c | 7 |
5 files changed, 30 insertions, 5 deletions
diff --git a/sys/amd64/amd64/tsc.c b/sys/amd64/amd64/tsc.c index 344d39f..15044ab 100644 --- a/sys/amd64/amd64/tsc.c +++ b/sys/amd64/amd64/tsc.c @@ -819,7 +819,12 @@ startrtclock() * We don't know at this point whether APM is going to be used * or not, nor when it might be activated. Play it safe. */ - return; + { + int disabled = 0; + resource_int_value("apm", 0, "disabled", &disabled); + if (disabled == 0) + return; + } #endif /* NAPM > 0 */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { diff --git a/sys/amd64/isa/clock.c b/sys/amd64/isa/clock.c index 344d39f..15044ab 100644 --- a/sys/amd64/isa/clock.c +++ b/sys/amd64/isa/clock.c @@ -819,7 +819,12 @@ startrtclock() * We don't know at this point whether APM is going to be used * or not, nor when it might be activated. Play it safe. */ - return; + { + int disabled = 0; + resource_int_value("apm", 0, "disabled", &disabled); + if (disabled == 0) + return; + } #endif /* NAPM > 0 */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { diff --git a/sys/i386/i386/tsc.c b/sys/i386/i386/tsc.c index 344d39f..15044ab 100644 --- a/sys/i386/i386/tsc.c +++ b/sys/i386/i386/tsc.c @@ -819,7 +819,12 @@ startrtclock() * We don't know at this point whether APM is going to be used * or not, nor when it might be activated. Play it safe. */ - return; + { + int disabled = 0; + resource_int_value("apm", 0, "disabled", &disabled); + if (disabled == 0) + return; + } #endif /* NAPM > 0 */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { diff --git a/sys/i386/isa/clock.c b/sys/i386/isa/clock.c index 344d39f..15044ab 100644 --- a/sys/i386/isa/clock.c +++ b/sys/i386/isa/clock.c @@ -819,7 +819,12 @@ startrtclock() * We don't know at this point whether APM is going to be used * or not, nor when it might be activated. Play it safe. */ - return; + { + int disabled = 0; + resource_int_value("apm", 0, "disabled", &disabled); + if (disabled == 0) + return; + } #endif /* NAPM > 0 */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { diff --git a/sys/isa/atrtc.c b/sys/isa/atrtc.c index 344d39f..15044ab 100644 --- a/sys/isa/atrtc.c +++ b/sys/isa/atrtc.c @@ -819,7 +819,12 @@ startrtclock() * We don't know at this point whether APM is going to be used * or not, nor when it might be activated. Play it safe. */ - return; + { + int disabled = 0; + resource_int_value("apm", 0, "disabled", &disabled); + if (disabled == 0) + return; + } #endif /* NAPM > 0 */ if (tsc_present && tsc_freq != 0 && !tsc_is_broken) { |