Merged from sys/i386/isa/clock.c revision 1.155.

This commit is contained in:
KATO Takenori 2000-08-04 08:15:45 +00:00
parent e62d73a2a1
commit c1e8fc20ac
3 changed files with 18 additions and 3 deletions

View File

@ -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) {

View File

@ -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) {

View File

@ -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) {