lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: fix ioremap API

Browse Source 
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Thomas Gleixner
2008-01-30 13:34:06 +01:00
committed by Ingo Molnar
parent 266b9f8727
commit 5f8681529c
3 changed files with 14 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
arch/x86/mm/ioremap.c
View File

@@ -106,7 +106,7 @@ static int ioremap_change_attr(unsigned long phys_addr, unsigned long size,
* have to convert them into an offset in a page-aligned mapping, but the * have to convert them into an offset in a page-aligned mapping, but the
* caller shouldn't need to know that small detail. * caller shouldn't need to know that small detail.
*/ */
void __iomem *__ioremap(unsigned long phys_addr, unsigned long size, static void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
unsigned long flags) unsigned long flags)
{ {
void __iomem *addr; void __iomem *addr;
@@ -164,7 +164,6 @@ void __iomem *__ioremap(unsigned long phys_addr, unsigned long size,
return (void __iomem *) (offset + (char __iomem *)addr); return (void __iomem *) (offset + (char __iomem *)addr);
} }
EXPORT_SYMBOL(__ioremap);
/** /**
* ioremap_nocache - map bus memory into CPU space * ioremap_nocache - map bus memory into CPU space
@@ -193,6 +192,12 @@ void __iomem *ioremap_nocache(unsigned long phys_addr, unsigned long size)
} }
EXPORT_SYMBOL(ioremap_nocache); EXPORT_SYMBOL(ioremap_nocache);
void __iomem *ioremap_cache(unsigned long phys_addr, unsigned long size)
{
return __ioremap(phys_addr, size, 0);
}
EXPORT_SYMBOL(ioremap_cache);
/** /**
* iounmap - Free a IO remapping * iounmap - Free a IO remapping
* @addr: virtual address from ioremap_* * @addr: virtual address from ioremap_*

9
include/asm-x86/io_32.h
View File

@@ -100,8 +100,6 @@ static inline void * phys_to_virt(unsigned long address)
*/ */
#define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT)
extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsigned long flags);
/** /**
* ioremap - map bus memory into CPU space * ioremap - map bus memory into CPU space
* @offset: bus address of the memory * @offset: bus address of the memory
@@ -117,12 +115,7 @@ extern void __iomem * __ioremap(unsigned long offset, unsigned long size, unsign
* look at pci_iomap(). * look at pci_iomap().
*/ */
extern void __iomem *ioremap_nocache(unsigned long offset, unsigned long size); extern void __iomem *ioremap_nocache(unsigned long offset, unsigned long size);
extern void __iomem *ioremap_cache(unsigned long offset, unsigned long size);
static inline void __iomem *
ioremap_cache(unsigned long offset, unsigned long size)
{
return __ioremap(offset, size, 0);
}
/* /*
* The default ioremap() behavior is non-cached: * The default ioremap() behavior is non-cached:

9
include/asm-x86/io_64.h
View File

@@ -150,8 +150,6 @@ static inline void * phys_to_virt(unsigned long address)
#include <asm-generic/iomap.h> #include <asm-generic/iomap.h>
extern void __iomem *__ioremap(unsigned long offset, unsigned long size, unsigned long flags);
extern void *early_ioremap(unsigned long addr, unsigned long size); extern void *early_ioremap(unsigned long addr, unsigned long size);
extern void early_iounmap(void *addr, unsigned long size); extern void early_iounmap(void *addr, unsigned long size);
@@ -161,12 +159,7 @@ extern void early_iounmap(void *addr, unsigned long size);
* or read caching is not desirable: * or read caching is not desirable:
*/ */
extern void __iomem *ioremap_nocache(unsigned long offset, unsigned long size); extern void __iomem *ioremap_nocache(unsigned long offset, unsigned long size);
extern void __iomem *ioremap_cache(unsigned long offset, unsigned long size);
static inline void __iomem *
ioremap_cache(unsigned long offset, unsigned long size)
{
return __ioremap(offset, size, 0);
}
/* /*
* The default ioremap() behavior is non-cached: * The default ioremap() behavior is non-cached: