Allow use of TSC even if APM is compiled in but disabled.

This commit is contained in:
Poul-Henning Kamp 2000-07-30 21:05:22 +00:00
parent 1c60ef3f3c
commit 0825a8a33f
5 changed files with 30 additions and 5 deletions

View File

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

View File

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

View File

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

View File

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

View File

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