summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/io_64.h
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-02-06 21:29:52 (GMT)
committerJeremy Fitzhardinge <jeremy@goop.org>2009-02-06 21:29:52 (GMT)
commit133822c5c038b265ddb6545cda3a4c88815c7d3d (patch)
treedaa2e77d813a26e5199285dc60dabd3baeeeb0ae /arch/x86/include/asm/io_64.h
parent976e8f677e42757e5586ea04a9ac8bb8ddaa037e (diff)
downloadlinux-fsl-qoriq-133822c5c038b265ddb6545cda3a4c88815c7d3d.tar.xz
x86: asm/io.h: unify ioremap prototypes
Impact: unify identical code asm/io_32.h and _64.h have identical prototypes for the ioremap family of functions. The 32-bit header had a more descriptive comment. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'arch/x86/include/asm/io_64.h')
-rw-r--r--arch/x86/include/asm/io_64.h22
1 files changed, 0 insertions, 22 deletions
diff --git a/arch/x86/include/asm/io_64.h b/arch/x86/include/asm/io_64.h
index e71b555..0424c07 100644
--- a/arch/x86/include/asm/io_64.h
+++ b/arch/x86/include/asm/io_64.h
@@ -144,28 +144,6 @@ __OUTS(l)
#include <asm-generic/iomap.h>
-/*
- * This one maps high address device memory and turns off caching for that area.
- * it's useful if some control registers are in such an area and write combining
- * or read caching is not desirable:
- */
-extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size);
-extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size);
-extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size,
- unsigned long prot_val);
-
-/*
- * The default ioremap() behavior is non-cached:
- */
-static inline void __iomem *ioremap(resource_size_t offset, unsigned long size)
-{
- return ioremap_nocache(offset, size);
-}
-
-extern void iounmap(volatile void __iomem *addr);
-
-extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys);
-
void __memcpy_fromio(void *, unsigned long, unsigned);
void __memcpy_toio(unsigned long, const void *, unsigned);