By popular demand, move __HAVE_ACPI and __PCI_REROUTE_INTERRUPT into

param.h.  Per request, I've placed these just after the
_NO_NAMESPACE_POLLUTION ifndef.  I've not renamed anything yet, but
may since we don't need the __.

Submitted by: bde, jhb, scottl, many others.

12 files changed, 15 insertions, 13 deletions

diff --git a/sys/alpha/include/_types.h b/sys/alpha/include/_types.h
index 88ae6e5..a8acbbb 100644
--- a/sys/alpha/include/_types.h
+++ b/sys/alpha/include/_types.h
@@ -43,8 +43,6 @@
 #error this file needs sys/cdefs.h as a prerequisite
 #endif
 
-#define __PCI_REROUTE_INTERRUPT
-
 /*
  * Basic types upon which most other types are built.
  */
diff --git a/sys/alpha/include/param.h b/sys/alpha/include/param.h
index f8e1a45..56c5a84 100644
--- a/sys/alpha/include/param.h
+++ b/sys/alpha/include/param.h
@@ -66,6 +66,8 @@
 
 #ifndef _NO_NAMESPACE_POLLUTION
 
+#define __PCI_REROUTE_INTERRUPT
+
 #ifndef _MACHINE_PARAM_H_
 #define _MACHINE_PARAM_H_
 
diff --git a/sys/amd64/include/_types.h b/sys/amd64/include/_types.h
index d129b21..4217c82 100644
--- a/sys/amd64/include/_types.h
+++ b/sys/amd64/include/_types.h
@@ -44,8 +44,6 @@
 #endif
 
 #define __NO_STRICT_ALIGNMENT
-#define __HAVE_ACPI
-#define __PCI_REROUTE_INTERRUPT
 
 /*
  * Basic types upon which most other types are built.
diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h
index 11cd977..b1b90f4 100644
--- a/sys/amd64/include/param.h
+++ b/sys/amd64/include/param.h
@@ -66,6 +66,9 @@
 
 #ifndef _NO_NAMESPACE_POLLUTION
 
+#define __HAVE_ACPI
+#define __PCI_REROUTE_INTERRUPT
+
 #ifndef _MACHINE_PARAM_H_
 #define	_MACHINE_PARAM_H_
 
diff --git a/sys/arm/include/_types.h b/sys/arm/include/_types.h
index 8775b96..c700f52 100644
--- a/sys/arm/include/_types.h
+++ b/sys/arm/include/_types.h
@@ -43,8 +43,6 @@
 #error this file needs sys/cdefs.h as a prerequisite
 #endif
 
-#define __PCI_REROUTE_INTERRUPT
-
 /*
  * Basic types upon which most other types are built.
  */
diff --git a/sys/arm/include/param.h b/sys/arm/include/param.h
index 65c4f4a..4c59eee 100644
--- a/sys/arm/include/param.h
+++ b/sys/arm/include/param.h
@@ -59,6 +59,8 @@
 
 #ifndef _NO_NAMESPACE_POLLUTION
 
+#define __PCI_REROUTE_INTERRUPT
+
 #ifndef _MACHINE_PARAM_H_
 #define	_MACHINE_PARAM_H_
 
diff --git a/sys/i386/include/_types.h b/sys/i386/include/_types.h
index 1238183..b272cf0 100644
--- a/sys/i386/include/_types.h
+++ b/sys/i386/include/_types.h
@@ -44,8 +44,6 @@
 #endif
 
 #define __NO_STRICT_ALIGNMENT
-#define __HAVE_ACPI
-#define __PCI_REROUTE_INTERRUPT
 
 /*
  * Basic types upon which most other types are built.
diff --git a/sys/i386/include/param.h b/sys/i386/include/param.h
index 633d164..0f67c27 100644
--- a/sys/i386/include/param.h
+++ b/sys/i386/include/param.h
@@ -51,6 +51,9 @@
 
 #ifndef _NO_NAMESPACE_POLLUTION
 
+#define __HAVE_ACPI
+#define __PCI_REROUTE_INTERRUPT
+
 #ifndef _MACHINE_PARAM_H_
 #define	_MACHINE_PARAM_H_
 
diff --git a/sys/ia64/include/_types.h b/sys/ia64/include/_types.h
index 5143ad4..8fc1be2 100644
--- a/sys/ia64/include/_types.h
+++ b/sys/ia64/include/_types.h
@@ -43,9 +43,6 @@
 #error this file needs sys/cdefs.h as a prerequisite
 #endif
 
-#define __HAVE_ACPI
-#define __PCI_REROUTE_INTERRUPT
-
 /*
  * Basic types upon which most other types are built.
  */
diff --git a/sys/ia64/include/param.h b/sys/ia64/include/param.h
index 233bc47..c71c6e5 100644
--- a/sys/ia64/include/param.h
+++ b/sys/ia64/include/param.h
@@ -65,6 +65,9 @@
 
 #ifndef _NO_NAMESPACE_POLLUTION
 
+#define __HAVE_ACPI
+#define __PCI_REROUTE_INTERRUPT
+
 #ifndef _MACHINE_PARAM_H_
 #define	_MACHINE_PARAM_H_
 
diff --git a/sys/pc98/include/_types.h b/sys/pc98/include/_types.h
index b5ff4b1..63da67a 100644
--- a/sys/pc98/include/_types.h
+++ b/sys/pc98/include/_types.h
@@ -4,5 +4,3 @@
 /* $FreeBSD$ */
 
 #include <i386/_types.h>
-
-#undef __HAVE_ACPI
diff --git a/sys/pc98/include/param.h b/sys/pc98/include/param.h
index 51803b2..2e44cf2 100644
--- a/sys/pc98/include/param.h
+++ b/sys/pc98/include/param.h
@@ -29,3 +29,5 @@
 #define MACHINE		"pc98"
 
 #include <i386/param.h>
+
+#undef __HAVE_ACPI