diff --git a/sys/dev/acpica/acpi_battery.c b/sys/dev/acpica/acpi_battery.c
--- a/sys/dev/acpica/acpi_battery.c
+++ b/sys/dev/acpica/acpi_battery.c
@@ -499,27 +499,27 @@
        CTLFLAG_RD | CTLFLAG_MPSAFE, 0, "battery status and info");
     SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx,
        SYSCTL_CHILDREN(acpi_battery_sysctl_tree),
-       OID_AUTO, "life", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
+       OID_AUTO, "life", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE,
        &acpi_battery_battinfo.cap, 0, acpi_battery_sysctl, "I",
        "percent capacity remaining");
     SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx,
        SYSCTL_CHILDREN(acpi_battery_sysctl_tree),
-       OID_AUTO, "time", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
+       OID_AUTO, "time", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE,
        &acpi_battery_battinfo.min, 0, acpi_battery_sysctl, "I",
        "remaining time in minutes");
     SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx,
        SYSCTL_CHILDREN(acpi_battery_sysctl_tree),
-       OID_AUTO, "rate", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
+       OID_AUTO, "rate", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE,
        &acpi_battery_battinfo.rate, 0, acpi_battery_sysctl, "I",
        "present rate in mW");
     SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx,
        SYSCTL_CHILDREN(acpi_battery_sysctl_tree),
-       OID_AUTO, "state", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
+       OID_AUTO, "state", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE,
        &acpi_battery_battinfo.state, 0, acpi_battery_sysctl, "I",
        "current status flags");
     SYSCTL_ADD_PROC(&acpi_battery_sysctl_ctx,
        SYSCTL_CHILDREN(acpi_battery_sysctl_tree),
-       OID_AUTO, "units", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_NEEDGIANT,
+       OID_AUTO, "units", CTLTYPE_INT | CTLFLAG_RD | CTLFLAG_MPSAFE,
        NULL, 0, acpi_battery_units_sysctl, "I", "number of batteries");
     SYSCTL_ADD_INT(&acpi_battery_sysctl_ctx,
        SYSCTL_CHILDREN(acpi_battery_sysctl_tree),