mirror of
https://github.com/adulau/aha.git
synced 2025-01-01 13:46:24 +00:00
x86: pat: Remove ioremap_default()
Commit:
b6ff32d
: x86, PAT: Consolidate code in pat_x_mtrr_type() and reserve_memtype()
consolidated reserve_memtype() and pat_x_mtrr_type,
this made ioremap_default() same as ioremap_cache().
Remove the redundant function and change the only caller to use
ioremap_cache.
Signed-off-by: Xiaotian Feng <dfeng@redhat.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
LKML-Reference: <1257845005-7938-1-git-send-email-dfeng@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
83ea05ea69
commit
2fb8f4e6a8
1 changed files with 1 additions and 25 deletions
|
@ -283,30 +283,6 @@ void __iomem *ioremap_cache(resource_size_t phys_addr, unsigned long size)
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(ioremap_cache);
|
EXPORT_SYMBOL(ioremap_cache);
|
||||||
|
|
||||||
static void __iomem *ioremap_default(resource_size_t phys_addr,
|
|
||||||
unsigned long size)
|
|
||||||
{
|
|
||||||
unsigned long flags;
|
|
||||||
void __iomem *ret;
|
|
||||||
int err;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* - WB for WB-able memory and no other conflicting mappings
|
|
||||||
* - UC_MINUS for non-WB-able memory with no other conflicting mappings
|
|
||||||
* - Inherit from confliting mappings otherwise
|
|
||||||
*/
|
|
||||||
err = reserve_memtype(phys_addr, phys_addr + size,
|
|
||||||
_PAGE_CACHE_WB, &flags);
|
|
||||||
if (err < 0)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
ret = __ioremap_caller(phys_addr, size, flags,
|
|
||||||
__builtin_return_address(0));
|
|
||||||
|
|
||||||
free_memtype(phys_addr, phys_addr + size);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void __iomem *ioremap_prot(resource_size_t phys_addr, unsigned long size,
|
void __iomem *ioremap_prot(resource_size_t phys_addr, unsigned long size,
|
||||||
unsigned long prot_val)
|
unsigned long prot_val)
|
||||||
{
|
{
|
||||||
|
@ -382,7 +358,7 @@ void *xlate_dev_mem_ptr(unsigned long phys)
|
||||||
if (page_is_ram(start >> PAGE_SHIFT))
|
if (page_is_ram(start >> PAGE_SHIFT))
|
||||||
return __va(phys);
|
return __va(phys);
|
||||||
|
|
||||||
addr = (void __force *)ioremap_default(start, PAGE_SIZE);
|
addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
|
||||||
if (addr)
|
if (addr)
|
||||||
addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
|
addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue