Date: Fri, 2 Apr 2010 16:57:25 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r206106 - vendor-sys/acpica/dist/include/platform Message-ID: <201004021657.o32GvPp4017102@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Fri Apr 2 16:57:25 2010 New Revision: 206106 URL: http://svn.freebsd.org/changeset/base/206106 Log: Integrate FreeBSD changes for acfreebsd.h. http://git.moblin.org/cgit.cgi/acpica/commit/?id=4580a813dd812d85c9a0ec1b77f7855c9940c60c Obtained from: Intel Modified: vendor-sys/acpica/dist/include/platform/acfreebsd.h Modified: vendor-sys/acpica/dist/include/platform/acfreebsd.h ============================================================================== --- vendor-sys/acpica/dist/include/platform/acfreebsd.h Fri Apr 2 16:50:24 2010 (r206105) +++ vendor-sys/acpica/dist/include/platform/acfreebsd.h Fri Apr 2 16:57:25 2010 (r206106) @@ -124,9 +124,10 @@ #include <machine/acpica_machdep.h> #define ACPI_UINTPTR_T uintptr_t + +#define ACPI_USE_DO_WHILE_0 #define ACPI_USE_LOCAL_CACHE #define ACPI_USE_SYSTEM_CLIBRARY -#define __cdecl #ifdef _KERNEL @@ -139,6 +140,7 @@ #include "opt_acpi.h" #define ACPI_THREAD_ID lwpid_t +#define ACPI_MUTEX_TYPE ACPI_OSL_MUTEX #ifdef ACPI_DEBUG #define ACPI_DEBUG_OUTPUT /* for backward compatibility */ @@ -166,11 +168,10 @@ #define ACPI_THREAD_ID pthread_t -/* Not building kernel code, so use libc */ #define ACPI_USE_STANDARD_HEADERS + #define ACPI_FLUSH_CPU_CACHE() -#define __cli() -#define __sti() +#define __cdecl #endif /* _KERNEL */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201004021657.o32GvPp4017102>