From owner-svn-src-all@FreeBSD.ORG  Mon Jun  8 17:11:47 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C27D8106566B;
	Mon,  8 Jun 2009 17:11:47 +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 7950D8FC16;
	Mon,  8 Jun 2009 17:11:47 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n58HBlbM036210;
	Mon, 8 Jun 2009 17:11:47 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n58HBlmt036209;
	Mon, 8 Jun 2009 17:11:47 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200906081711.n58HBlmt036209@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 8 Jun 2009 17:11:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r193730 - head/sys/contrib/dev/acpica/include/platform
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Jun 2009 17:11:48 -0000

Author: jkim
Date: Mon Jun  8 17:11:47 2009
New Revision: 193730
URL: http://svn.freebsd.org/changeset/base/193730

Log:
  Clean up FreeBSD-specific header file:
  
  - Define ACPI_USE_DO_WHILE_0 to add do while(0) around return_*() macros.
  - Define __cdecl only for user land.  It will never be used in kernel.
  - Remove __cli() and __sti().  They were deprecated long ago.

Modified:
  head/sys/contrib/dev/acpica/include/platform/acfreebsd.h

Modified: head/sys/contrib/dev/acpica/include/platform/acfreebsd.h
==============================================================================
--- head/sys/contrib/dev/acpica/include/platform/acfreebsd.h	Mon Jun  8 16:43:40 2009	(r193729)
+++ head/sys/contrib/dev/acpica/include/platform/acfreebsd.h	Mon Jun  8 17:11:47 2009	(r193730)
@@ -125,11 +125,10 @@
 
 #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
 
 #include <sys/ctype.h>
@@ -168,12 +167,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	ACPI_FLUSH_CPU_CACHE()
+#define	__cdecl
 
 #endif /* _KERNEL */