summaryrefslogtreecommitdiff
path: root/usr/src/uts/intel/sys
diff options
context:
space:
mode:
authorJohn Sonnenschein <johns@joyent.com>2011-12-15 22:43:18 +0000
committerJohn Sonnenschein <johns@joyent.com>2011-12-15 22:43:18 +0000
commitc4aa323138d7633d35c7cbf4123aa100970a91f9 (patch)
tree596fe3d0c3374835bf0e2e1d31e3ea8f3659422a /usr/src/uts/intel/sys
parent73c531dd5303a633bcaaf609c6eeb2554096b478 (diff)
parentf9b22ee9e48b04a9ef01426e92a13c5b164c0763 (diff)
downloadillumos-joyent-c4aa323138d7633d35c7cbf4123aa100970a91f9.tar.gz
Merge branch 'master' into gcc4
Diffstat (limited to 'usr/src/uts/intel/sys')
-rw-r--r--usr/src/uts/intel/sys/acpi/platform/acsolaris.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/usr/src/uts/intel/sys/acpi/platform/acsolaris.h b/usr/src/uts/intel/sys/acpi/platform/acsolaris.h
index d48d1a8fed..b0cd8bfcf3 100644
--- a/usr/src/uts/intel/sys/acpi/platform/acsolaris.h
+++ b/usr/src/uts/intel/sys/acpi/platform/acsolaris.h
@@ -19,6 +19,7 @@
* CDDL HEADER END
*/
/*
+ * Copyright 2011 Nexenta Systems, Inc. All rights reserved.
* Copyright 2009 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -36,6 +37,9 @@ extern "C" {
#include <sys/cpu.h>
#include <sys/thread.h>
+/* Function name used for debug output. */
+#define ACPI_GET_FUNCTION_NAME __func__
+
uint32_t __acpi_acquire_global_lock(void *);
uint32_t __acpi_release_global_lock(void *);
void __acpi_wbinvd(void);