aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKATO Takenori <kato@FreeBSD.org>2000-08-04 08:15:45 +0000
committerKATO Takenori <kato@FreeBSD.org>2000-08-04 08:15:45 +0000
commitc1e8fc20ac880b3bdac403aa92e571ac00950637 (patch)
tree850ac811ef3781d2538f44c971ce4ce1082e9783
parente62d73a2a11cd2e949203e6ae56a076c07fd149e (diff)
Notes
-rw-r--r--sys/pc98/cbus/clock.c7
-rw-r--r--sys/pc98/cbus/pcrtc.c7
-rw-r--r--sys/pc98/pc98/clock.c7
3 files changed, 18 insertions, 3 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c
index b0e63bb9743e..bb1275322531 100644
--- a/sys/pc98/cbus/clock.c
+++ b/sys/pc98/cbus/clock.c
@@ -1011,7 +1011,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/pc98/cbus/pcrtc.c b/sys/pc98/cbus/pcrtc.c
index b0e63bb9743e..bb1275322531 100644
--- a/sys/pc98/cbus/pcrtc.c
+++ b/sys/pc98/cbus/pcrtc.c
@@ -1011,7 +1011,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/pc98/pc98/clock.c b/sys/pc98/pc98/clock.c
index b0e63bb9743e..bb1275322531 100644
--- a/sys/pc98/pc98/clock.c
+++ b/sys/pc98/pc98/clock.c
@@ -1011,7 +1011,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) {