diff --git a/[refs] b/[refs] index 80ed7c0f827b..1fbd07fa3103 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0879750f5d75dee0546316b7b0e83fb6cd258ad7 +refs/heads/master: 9af993a92623e022c176459fa6607a564b9a7eaf diff --git a/trunk/include/asm-x86/io_64.h b/trunk/include/asm-x86/io_64.h index ee7a5c955962..f64a59cc396d 100644 --- a/trunk/include/asm-x86/io_64.h +++ b/trunk/include/asm-x86/io_64.h @@ -166,7 +166,7 @@ extern void __iomem *ioremap_cache(unsigned long offset, unsigned long size); */ static inline void __iomem *ioremap(unsigned long offset, unsigned long size) { - return ioremap_cache(offset, size); + return ioremap_nocache(offset, size); } extern void iounmap(volatile void __iomem *addr);