mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-25 16:13:17 +00:00
Merged from sys/i386/isa/clock.c revision 1.155.
This commit is contained in:
parent
e62d73a2a1
commit
c1e8fc20ac
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=64228
@ -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) {
|
||||
|
@ -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) {
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user