Commit 2fb8f4e6 authored by Xiaotian Feng's avatar Xiaotian Feng Committed by Ingo Molnar
Browse files

x86: pat: Remove ioremap_default()



: 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
Signed-off-by: default avatarXiaotian Feng <>
Cc: Suresh Siddha <>
Cc: Venkatesh Pallipadi <>
LKML-Reference: <>
Signed-off-by: default avatarIngo Molnar <>
parent 83ea05ea
......@@ -283,30 +283,6 @@ void __iomem *ioremap_cache(resource_size_t phys_addr, unsigned long size)
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,
free_memtype(phys_addr, phys_addr + size);
return ret;
void __iomem *ioremap_prot(resource_size_t phys_addr, unsigned long size,
unsigned long prot_val)
......@@ -382,7 +358,7 @@ void *xlate_dev_mem_ptr(unsigned long phys)
if (page_is_ram(start >> PAGE_SHIFT))
return __va(phys);
addr = (void __force *)ioremap_default(start, PAGE_SIZE);
addr = (void __force *)ioremap_cache(start, PAGE_SIZE);
if (addr)
addr = (void *)((unsigned long)addr | (phys & ~PAGE_MASK));
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment