diff --git a/share/man/man4/acpi.4 b/share/man/man4/acpi.4 index 67b27912b404..087a9defd93c 100644 --- a/share/man/man4/acpi.4 +++ b/share/man/man4/acpi.4 @@ -63,12 +63,6 @@ script, which can be configured via .Xr rc.conf 5 . If values are specified manually, they may be overridden. .Bl -tag -width indent -.It Va hw.acpi.cpu.throttle_max -Maximum value for CPU throttling, equal to 100% of the clock rate. -.It Va hw.acpi.cpu.throttle_state -Get or set the current throttling state, from 1 to -.Va hw.acpi.cpu.throttle_max . -This scales back the CPU clock rate and the corresponding power consumption. .It Va hw.acpi.cpu.cx_usage Debugging information listing the percent of total usage for each sleep state. The values are reset when diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5 index 31e2311dd12f..5639487e8e7d 100644 --- a/share/man/man5/rc.conf.5 +++ b/share/man/man5/rc.conf.5 @@ -2702,28 +2702,16 @@ indicates that should use the lowest power state available while .Dq Li HIGH indicates that the lowest latency state (less power savings) should be used. -.It Va performance_throttle_state +.It Va performance_cpu_freq .Pq Vt str -CPU throttling state to use while on AC power. +CPU clock frequency to use while on AC power. The string .Dq Li LOW indicates that -.Xr acpi 4 -should use the lowest throttling state available while +.Xr cpufreq 4 +should use the lowest frequency available while .Dq Li HIGH -indicates that the highest performance state (less power savings) should be -used. -.It Va economy_throttle_state -.Pq Vt str -CPU throttling state to use when off AC power. -The string -.Dq Li LOW -indicates that -.Xr acpi 4 -should use the lowest throttling state available while -.Dq Li HIGH -indicates that the highest performance state (less power savings) should be -used. +indicates that the highest frequency (less power savings) should be used. .It Va economy_cx_lowest .Pq Vt str CPU idle state to use when off AC power. @@ -2734,6 +2722,16 @@ indicates that should use the lowest power state available while .Dq Li HIGH indicates that the lowest latency state (less power savings) should be used. +.It Va economy_cpu_freq +.Pq Vt str +CPU clock frequency to use when off AC power. +The string +.Dq Li LOW +indicates that +.Xr cpufreq 4 +should use the lowest frequency available while +.Dq Li HIGH +indicates that the highest frequency (less power savings) should be used. .It Va jail_enable .Pq Vt bool If set to