From owner-svn-src-head@FreeBSD.ORG Thu Apr 14 16:19:41 2011 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 85B2E1065677; Thu, 14 Apr 2011 16:19:41 +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 6A72B8FC27; Thu, 14 Apr 2011 16:19:41 +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 p3EGJf7K040030; Thu, 14 Apr 2011 16:19:41 GMT (envelope-from jkim@svn.freebsd.org) Received: (from jkim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3EGJfUh040027; Thu, 14 Apr 2011 16:19:41 GMT (envelope-from jkim@svn.freebsd.org) Message-Id: <201104141619.p3EGJfUh040027@svn.freebsd.org> From: Jung-uk Kim Date: Thu, 14 Apr 2011 16:19:41 +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: r220629 - in head/sys: amd64/include i386/include X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Apr 2011 16:19:41 -0000 Author: jkim Date: Thu Apr 14 16:19:41 2011 New Revision: 220629 URL: http://svn.freebsd.org/changeset/base/220629 Log: Consistently use __volatile as the rest of this file. Modified: head/sys/amd64/include/cpufunc.h head/sys/i386/include/cpufunc.h Modified: head/sys/amd64/include/cpufunc.h ============================================================================== --- head/sys/amd64/include/cpufunc.h Thu Apr 14 16:14:35 2011 (r220628) +++ head/sys/amd64/include/cpufunc.h Thu Apr 14 16:19:41 2011 (r220629) @@ -176,7 +176,7 @@ inb(u_int port) { u_char data; - __asm volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); + __asm __volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -185,7 +185,7 @@ inl(u_int port) { u_int data; - __asm volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); + __asm __volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -227,20 +227,20 @@ inw(u_int port) { u_short data; - __asm volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); + __asm __volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } static __inline void outb(u_int port, u_char data) { - __asm volatile("outb %0, %w1" : : "a" (data), "Nd" (port)); + __asm __volatile("outb %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void outl(u_int port, u_int data) { - __asm volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); + __asm __volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void @@ -270,7 +270,7 @@ outsl(u_int port, const void *addr, size static __inline void outw(u_int port, u_short data) { - __asm volatile("outw %0, %w1" : : "a" (data), "Nd" (port)); + __asm __volatile("outw %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void Modified: head/sys/i386/include/cpufunc.h ============================================================================== --- head/sys/i386/include/cpufunc.h Thu Apr 14 16:14:35 2011 (r220628) +++ head/sys/i386/include/cpufunc.h Thu Apr 14 16:19:41 2011 (r220629) @@ -189,7 +189,7 @@ inb(u_int port) { u_char data; - __asm volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); + __asm __volatile("inb %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -198,7 +198,7 @@ inl(u_int port) { u_int data; - __asm volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); + __asm __volatile("inl %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -240,7 +240,7 @@ inw(u_int port) { u_short data; - __asm volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); + __asm __volatile("inw %w1, %0" : "=a" (data) : "Nd" (port)); return (data); } @@ -253,7 +253,7 @@ outb(u_int port, u_char data) static __inline void outl(u_int port, u_int data) { - __asm volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); + __asm __volatile("outl %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void @@ -283,7 +283,7 @@ outsl(u_int port, const void *addr, size static __inline void outw(u_int port, u_short data) { - __asm volatile("outw %0, %w1" : : "a" (data), "Nd" (port)); + __asm __volatile("outw %0, %w1" : : "a" (data), "Nd" (port)); } static __inline void