diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-31 16:06:54 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-31 16:06:54 -0700 |
| commit | 471101a18f657fe12c32d11b5d365600384d120b (patch) | |
| tree | 41feb6affaa1307b3ea83f491e877d9c01a28e72 | |
| parent | 6451c862226d1c895b94ba5911867e2779e9b5b0 (diff) | |
| download | glibc-471101a18f657fe12c32d11b5d365600384d120b.tar.gz glibc-471101a18f657fe12c32d11b5d365600384d120b.tar.xz glibc-471101a18f657fe12c32d11b5d365600384d120b.zip | |
Replace addr with __addr in x86_64 sys/io.h
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/sys/io.h | 41 |
2 files changed, 30 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog index a7c13d961b..c7968a1f92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,14 @@ 2012-05-31 H.J. Lu <hongjiu.lu@intel.com> [BZ #14117] + * sysdeps/unix/sysv/linux/x86_64/sys/io.h (insb): Replace addr + with __addr. + (insw): Likewise. + (insl): Likewise. + (outsb): Likewise. + (outsw): Likewise. + (outsl): Likewise. + * sysdeps/unix/sysv/linux/i386/bits/mman.h: Removed. * sysdeps/unix/sysv/linux/x86_64/bits/mman.h: Renamed to ... * sysdeps/unix/sysv/linux/x86/bits/mman.h: This. diff --git a/sysdeps/unix/sysv/linux/x86_64/sys/io.h b/sysdeps/unix/sysv/linux/x86_64/sys/io.h index d8fc27190c..84e5fc27c5 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sys/io.h +++ b/sysdeps/unix/sysv/linux/x86_64/sys/io.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 2000, 2002, 2009 Free Software Foundation, Inc. +/* Copyright (C) 1996-2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -133,45 +133,48 @@ outl_p (unsigned int __value, unsigned short int __port) } static __inline void -insb (unsigned short int __port, void *addr, unsigned long int __count) +insb (unsigned short int __port, void *__addr, unsigned long int __count) { - __asm__ __volatile__ ("cld ; rep ; insb":"=D" (addr), "=c" (__count) - :"d" (__port), "0" (addr), "1" (__count)); + __asm__ __volatile__ ("cld ; rep ; insb":"=D" (__addr), "=c" (__count) + :"d" (__port), "0" (__addr), "1" (__count)); } static __inline void -insw (unsigned short int __port, void *addr, unsigned long int __count) +insw (unsigned short int __port, void *__addr, unsigned long int __count) { - __asm__ __volatile__ ("cld ; rep ; insw":"=D" (addr), "=c" (__count) - :"d" (__port), "0" (addr), "1" (__count)); + __asm__ __volatile__ ("cld ; rep ; insw":"=D" (__addr), "=c" (__count) + :"d" (__port), "0" (__addr), "1" (__count)); } static __inline void -insl (unsigned short int __port, void *addr, unsigned long int __count) +insl (unsigned short int __port, void *__addr, unsigned long int __count) { - __asm__ __volatile__ ("cld ; rep ; insl":"=D" (addr), "=c" (__count) - :"d" (__port), "0" (addr), "1" (__count)); + __asm__ __volatile__ ("cld ; rep ; insl":"=D" (__addr), "=c" (__count) + :"d" (__port), "0" (__addr), "1" (__count)); } static __inline void -outsb (unsigned short int __port, const void *addr, unsigned long int __count) +outsb (unsigned short int __port, const void *__addr, + unsigned long int __count) { - __asm__ __volatile__ ("cld ; rep ; outsb":"=S" (addr), "=c" (__count) - :"d" (__port), "0" (addr), "1" (__count)); + __asm__ __volatile__ ("cld ; rep ; outsb":"=S" (__addr), "=c" (__count) + :"d" (__port), "0" (__addr), "1" (__count)); } static __inline void -outsw (unsigned short int __port, const void *addr, unsigned long int __count) +outsw (unsigned short int __port, const void *__addr, + unsigned long int __count) { - __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (addr), "=c" (__count) - :"d" (__port), "0" (addr), "1" (__count)); + __asm__ __volatile__ ("cld ; rep ; outsw":"=S" (____addr), "=c" (__count) + :"d" (__port), "0" (__addr), "1" (__count)); } static __inline void -outsl (unsigned short int __port, const void *addr, unsigned long int __count) +outsl (unsigned short int __port, const void *__addr, + unsigned long int __count) { - __asm__ __volatile__ ("cld ; rep ; outsl":"=S" (addr), "=c" (__count) - :"d" (__port), "0" (addr), "1" (__count)); + __asm__ __volatile__ ("cld ; rep ; outsl":"=S" (__addr), "=c" (__count) + :"d" (__port), "0" (__addr), "1" (__count)); } #endif /* GNU C */ |