svn commit: r235556 - in head/sys: amd64/acpica dev/acpica i386/acpica

[John Baldwin]

Author: jhb
Date: Thu May 17 17:58:53 2012
New Revision: 235556
URL: http://svn.freebsd.org/changeset/base/235556

Log:
  Centralize declaration of the debug.acpi sysctl node.

Modified:
  head/sys/amd64/acpica/acpi_machdep.c
  head/sys/dev/acpica/acpi_ec.c
  head/sys/dev/acpica/acpi_smbat.c
  head/sys/dev/acpica/acpivar.h
  head/sys/i386/acpica/acpi_machdep.c

Modified: head/sys/amd64/acpica/acpi_machdep.c
==============================================================================
--- head/sys/amd64/acpica/acpi_machdep.c	Thu May 17 17:30:16 2012	(r235555)
+++ head/sys/amd64/acpica/acpi_machdep.c	Thu May 17 17:58:53 2012	(r235556)
@@ -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,

Modified: head/sys/dev/acpica/acpi_ec.c
==============================================================================
--- head/sys/dev/acpica/acpi_ec.c	Thu May 17 17:30:16 2012	(r235555)
+++ head/sys/dev/acpica/acpi_ec.c	Thu May 17 17:58:53 2012	(r235556)
@@ -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;

Modified: head/sys/dev/acpica/acpi_smbat.c
==============================================================================
--- head/sys/dev/acpica/acpi_smbat.c	Thu May 17 17:30:16 2012	(r235555)
+++ head/sys/dev/acpica/acpi_smbat.c	Thu May 17 17:58:53 2012	(r235556)
@@ -62,7 +62,6 @@ static int	acpi_smbat_get_bst(device_t d
 
 ACPI_SERIAL_DECL(smbat, "ACPI Smart Battery");
 
-SYSCTL_DECL(_debug_acpi);
 static SYSCTL_NODE(_debug_acpi, OID_AUTO, batt, CTLFLAG_RD, NULL,
     "Battery debugging");
 

Modified: head/sys/dev/acpica/acpivar.h
==============================================================================
--- head/sys/dev/acpica/acpivar.h	Thu May 17 17:30:16 2012	(r235555)
+++ head/sys/dev/acpica/acpivar.h	Thu May 17 17:58:53 2012	(r235556)
@@ -492,5 +492,7 @@ ACPI_HANDLE	acpi_GetReference(ACPI_HANDL
 /* Use the device logging level for ktr(4). */
 #define	KTR_ACPI		KTR_DEV
 
+SYSCTL_DECL(_debug_acpi);
+
 #endif /* _KERNEL */
 #endif /* !_ACPIVAR_H_ */

Modified: head/sys/i386/acpica/acpi_machdep.c
==============================================================================
--- head/sys/i386/acpica/acpi_machdep.c	Thu May 17 17:30:16 2012	(r235555)
+++ head/sys/i386/acpica/acpi_machdep.c	Thu May 17 17:58:53 2012	(r235556)
@@ -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,