diff options
author | jkim <jkim@FreeBSD.org> | 2011-04-14 16:19:41 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2011-04-14 16:19:41 +0000 |
commit | 8ada5a0bae76b336930bf137438d4c0b00fd4a04 (patch) | |
tree | 3588c5f0d5351a339211b57884811fc8fb922976 | |
parent | 581c70b26c707a2270b61e87a2decaf7a77f97c0 (diff) | |
download | FreeBSD-src-8ada5a0bae76b336930bf137438d4c0b00fd4a04.zip FreeBSD-src-8ada5a0bae76b336930bf137438d4c0b00fd4a04.tar.gz |
Consistently use __volatile as the rest of this file.
-rw-r--r-- | sys/amd64/include/cpufunc.h | 12 | ||||
-rw-r--r-- | sys/i386/include/cpufunc.h | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sys/amd64/include/cpufunc.h b/sys/amd64/include/cpufunc.h index b5e0766..b06e490 100644 --- a/sys/amd64/include/cpufunc.h +++ b/sys/amd64/include/cpufunc.h @@ -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_t count) 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 diff --git a/sys/i386/include/cpufunc.h b/sys/i386/include/cpufunc.h index 5f21cb2..9285499 100644 --- a/sys/i386/include/cpufunc.h +++ b/sys/i386/include/cpufunc.h @@ -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_t count) 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 |