From 869ec176fc359ad2042f9cd1cabe3c297d524e26 Mon Sep 17 00:00:00 2001
From: Nate Lawson <njl@FreeBSD.org>
Date: Thu, 6 May 2004 02:18:58 +0000
Subject: [PATCH] Make unnecessary globals static and remove unused includes.

Pointed out by:	cscout
---
 sys/amd64/acpica/OsdEnvironment.c | 2 +-
 sys/dev/acpica/Osd/OsdSchedule.c  | 2 +-
 sys/dev/acpica/acpi_acad.c        | 1 -
 sys/dev/acpica/acpi_pci.c         | 2 --
 sys/dev/acpica/acpi_pcib.c        | 2 --
 sys/dev/acpica/acpi_thermal.c     | 1 -
 sys/i386/acpica/OsdEnvironment.c  | 4 +---
 sys/i386/acpica/acpi_wakeup.c     | 3 ---
 sys/ia64/acpica/OsdEnvironment.c  | 2 +-
 9 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/sys/amd64/acpica/OsdEnvironment.c b/sys/amd64/acpica/OsdEnvironment.c
index 63216b7ed74a..f12b42fd0bfa 100644
--- a/sys/amd64/acpica/OsdEnvironment.c
+++ b/sys/amd64/acpica/OsdEnvironment.c
@@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include "acpi.h"
 
-u_long amd64_acpi_root;
+static u_long amd64_acpi_root;
 
 SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0,
 	     "The physical address of the RSDP");
diff --git a/sys/dev/acpica/Osd/OsdSchedule.c b/sys/dev/acpica/Osd/OsdSchedule.c
index 0c8c1a733ddb..5c034e8ed64d 100644
--- a/sys/dev/acpica/Osd/OsdSchedule.c
+++ b/sys/dev/acpica/Osd/OsdSchedule.c
@@ -93,7 +93,7 @@ TASKQUEUE_DEFINE(acpi, taskqueue_acpi_enqueue, 0,
 		     SWI_TQ, 0, &taskqueue_acpi_ih));
 
 #ifdef ACPI_USE_THREADS
-STAILQ_HEAD(, acpi_task_queue) acpi_task_queue;
+static STAILQ_HEAD(, acpi_task_queue) acpi_task_queue;
 static struct mtx	acpi_task_mtx;
 
 static void
diff --git a/sys/dev/acpica/acpi_acad.c b/sys/dev/acpica/acpi_acad.c
index 20a1fe5e8dc5..af22286e902b 100644
--- a/sys/dev/acpica/acpi_acad.c
+++ b/sys/dev/acpica/acpi_acad.c
@@ -32,7 +32,6 @@
 #include <sys/bus.h>
 
 #include <machine/bus.h>
-#include <machine/resource.h>
 #include <sys/rman.h>
 #include <sys/ioccom.h>
 #include <sys/malloc.h>
diff --git a/sys/dev/acpica/acpi_pci.c b/sys/dev/acpica/acpi_pci.c
index 969577f4c787..c6e95fd56b5c 100644
--- a/sys/dev/acpica/acpi_pci.c
+++ b/sys/dev/acpica/acpi_pci.c
@@ -29,8 +29,6 @@
 #include <sys/cdefs.h>
 __FBSDID("$FreeBSD$");
 
-#include "opt_bus.h"
-
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/bus.h>
diff --git a/sys/dev/acpica/acpi_pcib.c b/sys/dev/acpica/acpi_pcib.c
index 3ba945c92260..ee6bd6f27f63 100644
--- a/sys/dev/acpica/acpi_pcib.c
+++ b/sys/dev/acpica/acpi_pcib.c
@@ -38,9 +38,7 @@ __FBSDID("$FreeBSD$");
 #include <dev/acpica/acpivar.h>
 #include <dev/acpica/acpi_pcibvar.h>
 
-#include <machine/pci_cfgreg.h>
 #include <dev/pci/pcivar.h>
-#include <dev/pci/pcib_private.h>
 #include "pcib_if.h"
 
 /* Hooks for the ACPI CA debugging infrastructure. */
diff --git a/sys/dev/acpica/acpi_thermal.c b/sys/dev/acpica/acpi_thermal.c
index 27f46de094cf..ef972003d372 100644
--- a/sys/dev/acpica/acpi_thermal.c
+++ b/sys/dev/acpica/acpi_thermal.c
@@ -34,7 +34,6 @@ __FBSDID("$FreeBSD$");
 #include <sys/kthread.h>
 #include <sys/bus.h>
 #include <sys/proc.h>
-#include <sys/reboot.h>
 #include <sys/sysctl.h>
 #include <sys/unistd.h>
 #include <sys/power.h>
diff --git a/sys/i386/acpica/OsdEnvironment.c b/sys/i386/acpica/OsdEnvironment.c
index 66307bf5b90e..6cb3e9eea095 100644
--- a/sys/i386/acpica/OsdEnvironment.c
+++ b/sys/i386/acpica/OsdEnvironment.c
@@ -37,9 +37,7 @@ __FBSDID("$FreeBSD$");
 
 #include "acpi.h"
 
-#include <machine/pc/bios.h>
-
-u_long i386_acpi_root;
+static u_long i386_acpi_root;
 
 SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &i386_acpi_root, 0,
 	     "The physical address of the RSDP");
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
index 53d4554e9899..c0deba8f5628 100644
--- a/sys/i386/acpica/acpi_wakeup.c
+++ b/sys/i386/acpica/acpi_wakeup.c
@@ -37,13 +37,10 @@ __FBSDID("$FreeBSD$");
 #include <sys/sysctl.h>
 
 #include <vm/vm.h>
-#include <vm/vm_param.h>
 #include <vm/pmap.h>
 #include <vm/vm_object.h>
 #include <vm/vm_page.h>
 #include <vm/vm_map.h>
-#include <vm/vm_kern.h>
-#include <vm/vm_extern.h>
 
 #include <machine/bus.h>
 #include <machine/cpufunc.h>
diff --git a/sys/ia64/acpica/OsdEnvironment.c b/sys/ia64/acpica/OsdEnvironment.c
index e0fe8f526c71..a6a62f63d814 100644
--- a/sys/ia64/acpica/OsdEnvironment.c
+++ b/sys/ia64/acpica/OsdEnvironment.c
@@ -39,7 +39,7 @@
 extern u_int64_t ia64_efi_acpi_table;
 extern u_int64_t ia64_efi_acpi20_table;
 
-u_long ia64_acpi_root;
+static u_long ia64_acpi_root;
 
 SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &ia64_acpi_root, 0,
 	     "The physical address of the RSDP");