Re: [PATCH v2 7/9] io: Make ioremap() prototype conform to Linux one

[Andrew Jones <drjones@redhat.com>]

On Wed, Apr 27, 2016 at 03:13:56PM +0200, Alexander Gordeev wrote:
> This update also adds missing __iomem specificator which
> has been used by existing IO accessors.
> 
> Cc: Andrew Jones <drjones@redhat.com>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Radim Krčmář <rkrcmar@redhat.com>
> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> ---
>  lib/asm-generic/io.h | 4 ++--
>  lib/ppc64/asm/io.h   | 2 ++
>  lib/x86/asm/io.h     | 2 ++
>  3 files changed, 6 insertions(+), 2 deletions(-)

Reviewed-by: Andrew Jones <drjones@redhat.com>

> 
> diff --git a/lib/asm-generic/io.h b/lib/asm-generic/io.h
> index 3585ac0..28fe981 100644
> --- a/lib/asm-generic/io.h
> +++ b/lib/asm-generic/io.h
> @@ -153,10 +153,10 @@ static inline u64 __bswap64(u64 x)
>  	({ wmb(); __raw_writeq(cpu_to_le64(b), addr); })
>  
>  #ifndef ioremap
> -static inline void *ioremap(u64 phys_addr, size_t size __unused)
> +static inline void __iomem *ioremap(phys_addr_t phys_addr, size_t size __unused)
>  {
>  	assert(sizeof(long) == 8 || !(phys_addr >> 32));
> -	return (void *)(unsigned long)phys_addr;
> +	return (void __iomem *)(unsigned long)phys_addr;
>  }
>  #endif
>  
> diff --git a/lib/ppc64/asm/io.h b/lib/ppc64/asm/io.h
> index 4f2c31b..2b4dd2b 100644
> --- a/lib/ppc64/asm/io.h
> +++ b/lib/ppc64/asm/io.h
> @@ -9,5 +9,7 @@
>  #error Undefined byte order
>  #endif
>  
> +#define __iomem
> +
>  #include <asm-generic/io.h>
>  #endif
> diff --git a/lib/x86/asm/io.h b/lib/x86/asm/io.h
> index 74451d5..c37450f 100644
> --- a/lib/x86/asm/io.h
> +++ b/lib/x86/asm/io.h
> @@ -4,6 +4,8 @@
>  #include "asm/page.h"
>  #include "asm/barrier.h"
>  
> +#define __iomem
> +
>  static inline unsigned char inb(unsigned short port)
>  {
>      unsigned char value;
> -- 
> 1.8.3.1
> 
> --
> To unsubscribe from this list: send the line "unsubscribe kvm" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html