diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2014-06-27 22:05:21 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2014-06-27 22:05:21 +0000 |
| commit | 37a107a407cdb47ee0f4c4337e369e9973b34076 (patch) | |
| tree | fce5301b062a855bc68b9cb76c6b5966c5a2acbe /sys/i386/acpica | |
| parent | d2f1b8f4d2975ca1ec3e7519f9d755af40f357e0 (diff) | |
| download | src-37a107a407cdb47ee0f4c4337e369e9973b34076.tar.gz src-37a107a407cdb47ee0f4c4337e369e9973b34076.zip | |
Revert r267961, r267973:
These changes prevent sysctl(8) from returning proper output,
such as:
1) no output from sysctl(8)
2) erroneously returning ENOMEM with tools like truss(1)
or uname(1)
truss: can not get etype: Cannot allocate memory
Notes
Notes:
svn path=/head/; revision=267985
Diffstat (limited to 'sys/i386/acpica')
| -rw-r--r-- | sys/i386/acpica/acpi_machdep.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c index 049354b0c213..a244e7377c95 100644 --- a/sys/i386/acpica/acpi_machdep.c +++ b/sys/i386/acpica/acpi_machdep.c @@ -45,7 +45,8 @@ __FBSDID("$FreeBSD$"); #include <machine/nexusvar.h> uint32_t acpi_resume_beep; -SYSCTL_UINT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RWTUN, &acpi_resume_beep, +TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep); +SYSCTL_UINT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep, 0, "Beep the PC speaker when resuming"); uint32_t acpi_reset_video; |