From owner-svn-src-vendor@FreeBSD.ORG  Fri Apr  2 16:57:25 2010
Return-Path: <owner-svn-src-vendor@FreeBSD.ORG>
Delivered-To: svn-src-vendor@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 83D9D106566C;
	Fri,  2 Apr 2010 16:57:25 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 72D9E8FC18;
	Fri,  2 Apr 2010 16:57:25 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o32GvPZ8017104;
	Fri, 2 Apr 2010 16:57:25 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o32GvPp4017102;
	Fri, 2 Apr 2010 16:57:25 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201004021657.o32GvPp4017102@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Fri, 2 Apr 2010 16:57:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-vendor@freebsd.org
X-SVN-Group: vendor-sys
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r206106 - vendor-sys/acpica/dist/include/platform
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
	<svn-src-vendor.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>, 
	<mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
	<mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 02 Apr 2010 16:57:25 -0000

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 */