summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>2001-05-29 20:03:32 +0000
committermsmith <msmith@FreeBSD.org>2001-05-29 20:03:32 +0000
commit810dc37f4bf4cf37152c3f4237fa797d9f76679d (patch)
treeaa58b71025e403ee89e99d467409901404863d28 /sys/contrib
parentadc622bc2d7f44144b00414f40341c94f96be143 (diff)
downloadFreeBSD-src-810dc37f4bf4cf37152c3f4237fa797d9f76679d.zip
FreeBSD-src-810dc37f4bf4cf37152c3f4237fa797d9f76679d.tar.gz
- wbinvd isn't an inline on ia64.
- includes are not in subdirectories.
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/dev/acpica/acgcc.h2
-rw-r--r--sys/contrib/dev/acpica/acpi.h2
-rw-r--r--sys/contrib/dev/acpica/acpiosxf.h2
3 files changed, 2 insertions, 4 deletions
diff --git a/sys/contrib/dev/acpica/acgcc.h b/sys/contrib/dev/acpica/acgcc.h
index 435277d..ce7fac5 100644
--- a/sys/contrib/dev/acpica/acgcc.h
+++ b/sys/contrib/dev/acpica/acgcc.h
@@ -130,9 +130,7 @@
#define BREAKPOINT3
#define disable() __cli()
#define enable() __sti()
-#ifndef __FreeBSD__ /* XXX conflicts with inline in cpufunc.h */
#define wbinvd()
-#endif
/*! [Begin] no source code translation */
diff --git a/sys/contrib/dev/acpica/acpi.h b/sys/contrib/dev/acpica/acpi.h
index fca0cb4..bdbb201 100644
--- a/sys/contrib/dev/acpica/acpi.h
+++ b/sys/contrib/dev/acpica/acpi.h
@@ -123,7 +123,7 @@
* in the rest of the source code again and again.
*/
#include "acconfig.h" /* Configuration constants */
-#include "platform/acenv.h" /* Target environment specific items */
+#include "acenv.h" /* Target environment specific items */
#include "actypes.h" /* Fundamental common data types */
#include "acexcep.h" /* ACPI exception codes */
#include "acmacros.h" /* C macros */
diff --git a/sys/contrib/dev/acpica/acpiosxf.h b/sys/contrib/dev/acpica/acpiosxf.h
index a893970..b84c442 100644
--- a/sys/contrib/dev/acpica/acpiosxf.h
+++ b/sys/contrib/dev/acpica/acpiosxf.h
@@ -120,7 +120,7 @@
#ifndef __ACPIOSXF_H__
#define __ACPIOSXF_H__
-#include "platform/acenv.h"
+#include "acenv.h"
#include "actypes.h"
OpenPOWER on IntegriCloud