From c4b66729a39c438651c427c101646b3158a50ee8 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Wed, 17 Oct 2007 18:04:39 +0200 Subject: [PATCH] --- yaml --- r: 71005 b: refs/heads/master c: 3c215b6680b347593705e010688e80400d772763 h: refs/heads/master i: 71003: e573ee2e84387c75cced92def6674f4ec032fc56 v: v3 --- [refs] | 2 +- trunk/include/asm-x86/io_32.h | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index eee9d6d8d556..65c8e507fe69 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95c1e9aefa5d3a2dd61304797cad96e8fdcd95ce +refs/heads/master: 3c215b6680b347593705e010688e80400d772763 diff --git a/trunk/include/asm-x86/io_32.h b/trunk/include/asm-x86/io_32.h index 4ea7b1ad3c1d..fe881cd1e6f4 100644 --- a/trunk/include/asm-x86/io_32.h +++ b/trunk/include/asm-x86/io_32.h @@ -199,17 +199,22 @@ static inline void writel(unsigned int b, volatile void __iomem *addr) #define mmiowb() -static inline void memset_io(volatile void __iomem *addr, unsigned char val, int count) +static inline void +memset_io(volatile void __iomem *addr, unsigned char val, int count) { - memset((void __force *) addr, val, count); + memset((void __force *)addr, val, count); } -static inline void memcpy_fromio(void *dst, const volatile void __iomem *src, int count) + +static inline void +memcpy_fromio(void *dst, const volatile void __iomem *src, int count) { - __memcpy(dst, (void __force *) src, count); + __memcpy(dst, (const void __force *)src, count); } -static inline void memcpy_toio(volatile void __iomem *dst, const void *src, int count) + +static inline void +memcpy_toio(volatile void __iomem *dst, const void *src, int count) { - __memcpy((void __force *) dst, src, count); + __memcpy((void __force *)dst, src, count); } /*