Date: Thu, 14 Apr 2011 16:19:41 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r220629 - in head/sys: amd64/include i386/include Message-ID: <201104141619.p3EGJfUh040027@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104141619.p3EGJfUh040027>