summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjhb <jhb@FreeBSD.org>2012-05-17 17:58:53 +0000
committerjhb <jhb@FreeBSD.org>2012-05-17 17:58:53 +0000
commit65fb12126dbf4a4290edf13d3964f72e6083474b (patch)
tree6009589e265135a337e9b3fcad4b0d2e4bbc4a57
parent9d03cfba2323296542b81c995f1a5bb7b844d6c8 (diff)
downloadFreeBSD-src-65fb12126dbf4a4290edf13d3964f72e6083474b.zip
FreeBSD-src-65fb12126dbf4a4290edf13d3964f72e6083474b.tar.gz
Centralize declaration of the debug.acpi sysctl node.
-rw-r--r--sys/amd64/acpica/acpi_machdep.c2
-rw-r--r--sys/dev/acpica/acpi_ec.c1
-rw-r--r--sys/dev/acpica/acpi_smbat.c1
-rw-r--r--sys/dev/acpica/acpivar.h2
-rw-r--r--sys/i386/acpica/acpi_machdep.c2
5 files changed, 2 insertions, 6 deletions
diff --git a/sys/amd64/acpica/acpi_machdep.c b/sys/amd64/acpica/acpi_machdep.c
index 25dd173..f57bdc2 100644
--- a/sys/amd64/acpica/acpi_machdep.c
+++ b/sys/amd64/acpica/acpi_machdep.c
@@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$");
#include <machine/nexusvar.h>
-SYSCTL_DECL(_debug_acpi);
-
int acpi_resume_beep;
TUNABLE_INT("debug.acpi.resume_beep", &acpi_resume_beep);
SYSCTL_INT(_debug_acpi, OID_AUTO, resume_beep, CTLFLAG_RW, &acpi_resume_beep,
diff --git a/sys/dev/acpica/acpi_ec.c b/sys/dev/acpica/acpi_ec.c
index f8af33c..46e17d3 100644
--- a/sys/dev/acpica/acpi_ec.c
+++ b/sys/dev/acpica/acpi_ec.c
@@ -178,7 +178,6 @@ struct acpi_ec_softc {
ACPI_SERIAL_DECL(ec, "ACPI embedded controller");
-SYSCTL_DECL(_debug_acpi);
static SYSCTL_NODE(_debug_acpi, OID_AUTO, ec, CTLFLAG_RD, NULL, "EC debugging");
static int ec_burst_mode;
diff --git a/sys/dev/acpica/acpi_smbat.c b/sys/dev/acpica/acpi_smbat.c
index 0647772..f83392f 100644
--- a/sys/dev/acpica/acpi_smbat.c
+++ b/sys/dev/acpica/acpi_smbat.c
@@ -62,7 +62,6 @@ static int acpi_smbat_get_bst(device_t dev, struct acpi_bst *bst);
ACPI_SERIAL_DECL(smbat, "ACPI Smart Battery");
-SYSCTL_DECL(_debug_acpi);
static SYSCTL_NODE(_debug_acpi, OID_AUTO, batt, CTLFLAG_RD, NULL,
"Battery debugging");
diff --git a/sys/dev/acpica/acpivar.h b/sys/dev/acpica/acpivar.h
index 5791ca5..a1892ea 100644
--- a/sys/dev/acpica/acpivar.h
+++ b/sys/dev/acpica/acpivar.h
@@ -492,5 +492,7 @@ ACPI_HANDLE acpi_GetReference(ACPI_HANDLE scope, ACPI_OBJECT *obj);
/* Use the device logging level for ktr(4). */
#define KTR_ACPI KTR_DEV
+SYSCTL_DECL(_debug_acpi);
+
#endif /* _KERNEL */
#endif /* !_ACPIVAR_H_ */
diff --git a/sys/i386/acpica/acpi_machdep.c b/sys/i386/acpica/acpi_machdep.c
index 0f5d5b8..0872127 100644
--- a/sys/i386/acpica/acpi_machdep.c
+++ b/sys/i386/acpica/acpi_machdep.c
@@ -44,8 +44,6 @@ __FBSDID("$FreeBSD$");
#include <machine/nexusvar.h>
-SYSCTL_DECL(_debug_acpi);
-
uint32_t 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,
OpenPOWER on IntegriCloud