diff options
| author | kato <kato@FreeBSD.org> | 2000-08-04 08:15:45 +0000 |
|---|---|---|
| committer | kato <kato@FreeBSD.org> | 2000-08-04 08:15:45 +0000 |
| commit | 3e35beccf8dfdf1b5aa9fa620a513144243a7b16 (patch) | |
| tree | f93186184d99b5737dd66ca6fb06a7ba7803e3c1 /sys | |
| parent | 06273e7e66699792df5ba65873cdd78abaf68340 (diff) | |
| download | FreeBSD-src-3e35beccf8dfdf1b5aa9fa620a513144243a7b16.zip FreeBSD-src-3e35beccf8dfdf1b5aa9fa620a513144243a7b16.tar.gz | |
Merged from sys/i386/isa/clock.c revision 1.155.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/pc98/cbus/clock.c | 7 | ||||
| -rw-r--r-- | sys/pc98/cbus/pcrtc.c | 7 | ||||
| -rw-r--r-- | sys/pc98/pc98/clock.c | 7 |
3 files changed, 18 insertions, 3 deletions
diff --git a/sys/pc98/cbus/clock.c b/sys/pc98/cbus/clock.c index b0e63bb..bb12753 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 b0e63bb..bb12753 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 b0e63bb..bb12753 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) { |
