x86: PAT remove ioremap_default
PATCH 2/2 x86: PAT remove ioremap_default
commit b6ff32 consolidates reserve_memtype and pat_x_mtrr_type, this makes ioremap_default same as ioremap_cache. Remove the redundant function and change the only caller to use ioremap_cache.
Signed-off-by Xiaotian Feng <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Suresh Siddha <[email protected]>
Cc Venkatesh Pallipadi <[email protected]>
--- arch/x86/mm/ioremap.c | 26 +------------------------- 1 files changed, 1 insertions(+), 25 deletions(-)
arch/x86/mm/ioremap.c +1 -25
@@ -281,30 +281,6 @@ void __iomem *ioremap_cache(resource_size_t phys_addr, unsigned long size) }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,unsigned long prot_val) {
@@ -380,7 +356,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 ));
Signature · 1 line
1.6.2.5
[tip:x86/pat] x86: pat: Remove ioremap_default()
Commit-ID: 2fb8f4e6a83dcaec15c1dd0ee8a6f618e7ece7f0 Gitweb: http://git.kernel.org/tip/2fb8f4e6a83dcaec15c1dd0ee8a6f618e7ece7f0 Author: Xiaotian Feng <[email protected]> AuthorDate: Tue, 10 Nov 2009 17:23:25 +0800 Committer: Ingo Molnar <[email protected]> CommitDate: Tue, 10 Nov 2009 10:34:05 +0100
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 <[email protected]>
Cc Suresh Siddha <[email protected]>
Cc Venkatesh Pallipadi <[email protected]>
LKML-Reference: <[email protected]>
Signed-off-by Ingo Molnar <[email protected]>
--- arch/x86/mm/ioremap.c | 26 +------------------------- 1 files changed, 1 insertions(+), 25 deletions(-)
arch/x86/mm/ioremap.c +1 -25
@@ -283,30 +283,6 @@ void __iomem *ioremap_cache(resource_size_t phys_addr, unsigned long size) }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,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 ));