From df29c611b762b32a90adbb768b8c38624c952f6a Mon Sep 17 00:00:00 2001 From: Sepherosa Ziehau Date: Sun, 28 Jun 2015 19:51:19 +0800 Subject: [PATCH] acpi/pstate: Rename sysctl node available_bin to avail And hide sysctl node available from sysctl list. --- sys/dev/acpica/acpi_cpu_pstate.c | 6 +++--- usr.sbin/powerd/powerd.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/dev/acpica/acpi_cpu_pstate.c b/sys/dev/acpica/acpi_cpu_pstate.c index 380c92681c..45b1a11042 100644 --- a/sys/dev/acpica/acpi_cpu_pstate.c +++ b/sys/dev/acpica/acpi_cpu_pstate.c @@ -1095,16 +1095,16 @@ acpi_pst_postattach(void *arg __unused) SYSCTL_ADD_PROC(&dom->pd_sysctl_ctx, SYSCTL_CHILDREN(dom->pd_sysctl_tree), OID_AUTO, "available", - CTLTYPE_STRING | CTLFLAG_RD, + CTLTYPE_STRING | CTLFLAG_RD | CTLFLAG_SKIP, dom, 0, acpi_pst_sysctl_freqs, "A", "available frequencies"); SYSCTL_ADD_PROC(&dom->pd_sysctl_ctx, SYSCTL_CHILDREN(dom->pd_sysctl_tree), - OID_AUTO, "available_bin", + OID_AUTO, "avail", CTLTYPE_OPAQUE | CTLFLAG_RD, dom, 0, acpi_pst_sysctl_freqs_bin, "IU", - "available frequencies (binary format)"); + "available frequencies"); SYSCTL_ADD_PROC(&dom->pd_sysctl_ctx, SYSCTL_CHILDREN(dom->pd_sysctl_tree), diff --git a/usr.sbin/powerd/powerd.c b/usr.sbin/powerd/powerd.c index 59f3d19a3c..ba6b6bc28b 100644 --- a/usr.sbin/powerd/powerd.c +++ b/usr.sbin/powerd/powerd.c @@ -489,8 +489,7 @@ acpi_getcpufreq_bin(int dom_id, int *highest0, int *lowest0) /* * Retrieve availability list */ - snprintf(sysid, sizeof(sysid), "hw.acpi.cpu.px_dom%d.available_bin", - dom_id); + snprintf(sysid, sizeof(sysid), "hw.acpi.cpu.px_dom%d.avail", dom_id); freqlen = sizeof(freq); if (sysctlbyname(sysid, freq, &freqlen, NULL, 0) < 0) return 0; -- 2.41.0