Module Name: src
Committed By: jruoho
Date: Sat Jul 24 21:53:54 UTC 2010
Modified Files:
src/sys/arch/ia64/include: acpi_func.h
src/sys/arch/x86/include: acpi_machdep.h
src/sys/dev/acpi/acpica: acpi_func.h
Log Message:
Revert the previous partially for the time being.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/include/acpi_func.h
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/x86/include/acpi_machdep.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/acpi/acpica/acpi_func.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/include/acpi_func.h
diff -u src/sys/arch/ia64/include/acpi_func.h:1.3 src/sys/arch/ia64/include/acpi_func.h:1.4
--- src/sys/arch/ia64/include/acpi_func.h:1.3 Sat Jul 24 09:35:36 2010
+++ src/sys/arch/ia64/include/acpi_func.h Sat Jul 24 21:53:53 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_func.h,v 1.3 2010/07/24 09:35:36 jruoho Exp $ */
+/* $NetBSD: acpi_func.h,v 1.4 2010/07/24 21:53:53 jruoho Exp $ */
/*-
* Copyright (c) 2002 Mitsuru IWASAKI
@@ -31,7 +31,7 @@
/******************************************************************************
*
* Name: acpica_machdep.h - arch-specific defines, etc.
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
*****************************************************************************/
@@ -48,12 +48,6 @@
#define ACPI_DISABLE_IRQS() disable_intr()
#define ACPI_ENABLE_IRQS() enable_intr()
-#ifdef ACPI_FLUSH_CPU_CACHE
-#undef ACPI_FLUSH_CPU_CACHE
-#endif
-
-#define ACPI_FLUSH_CPU_CACHE() /* XXX ia64_fc()? */
-
/* Section 5.2.9.1: global lock acquire/release functions */
extern int acpi_acquire_global_lock(uint32_t *lock);
extern int acpi_release_global_lock(uint32_t *lock);
Index: src/sys/arch/x86/include/acpi_machdep.h
diff -u src/sys/arch/x86/include/acpi_machdep.h:1.6 src/sys/arch/x86/include/acpi_machdep.h:1.7
--- src/sys/arch/x86/include/acpi_machdep.h:1.6 Sat Jul 24 09:35:36 2010
+++ src/sys/arch/x86/include/acpi_machdep.h Sat Jul 24 21:53:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_machdep.h,v 1.6 2010/07/24 09:35:36 jruoho Exp $ */
+/* $NetBSD: acpi_machdep.h,v 1.7 2010/07/24 21:53:54 jruoho Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -49,12 +49,6 @@
ACPI_STATUS acpi_md_OsTerminate(void);
ACPI_PHYSICAL_ADDRESS acpi_md_OsGetRootPointer(void);
-#ifdef ACPI_FLUSH_CPU_CACHE
-#undef ACPI_FLUSH_CPU_CACHE
-#endif
-
-#define ACPI_FLUSH_CPU_CACHE() wbinvd()
-
#define acpi_md_OsIn8(x) inb((x))
#define acpi_md_OsIn16(x) inw((x))
#define acpi_md_OsIn32(x) inl((x))
Index: src/sys/dev/acpi/acpica/acpi_func.h
diff -u src/sys/dev/acpi/acpica/acpi_func.h:1.3 src/sys/dev/acpi/acpica/acpi_func.h:1.4
--- src/sys/dev/acpi/acpica/acpi_func.h:1.3 Sat Jul 24 09:35:36 2010
+++ src/sys/dev/acpi/acpica/acpi_func.h Sat Jul 24 21:53:54 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_func.h,v 1.3 2010/07/24 09:35:36 jruoho Exp $ */
+/* $NetBSD: acpi_func.h,v 1.4 2010/07/24 21:53:54 jruoho Exp $ */
/*-
* Copyright (c) 2000 Michael Smith
@@ -28,6 +28,9 @@
* SUCH DAMAGE.
*/
+#ifndef _SYS_DEV_ACPI_ACPICA_ACPI_FUNC_H
+#define _SYS_DEV_ACPI_ACPICA_ACPI_FUNC_H
+
#include <machine/cpufunc.h>
#include <sys/atomic.h>
@@ -77,3 +80,13 @@
return old & GL_BIT_PENDING;
}
+/*
+ * XXX: Should be in a MD header.
+ */
+#ifndef __ia64__
+#define ACPI_FLUSH_CPU_CACHE() wbinvd()
+#else
+#define ACPI_FLUSH_CPU_CACHE() /* XXX: ia64_fc()? */
+#endif
+
+#endif /* !_SYS_DEV_ACPI_ACPICA_ACPI_FUNC_H */
