x86/mm/pat: Drop the rbt_ prefix from external memtype calls

[linux-2.6-microblaze.git] / arch / x86 / mm / pat.c

diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c
index d9fbd4f..2d758e1 100644 (file)
--- a/arch/x86/mm/pat.c
+++ b/arch/x86/mm/pat.c
@@ -603,7 +603,7 @@ int reserve_memtype(u64 start, u64 end, enum page_cache_mode req_type,
 
        spin_lock(&memtype_lock);
 
-       err = rbt_memtype_check_insert(new, new_type);
+       err = memtype_check_insert(new, new_type);
        if (err) {
                pr_info("x86/PAT: reserve_memtype failed [mem %#010Lx-%#010Lx], track %s, req %s\n",
                        start, end - 1,
@@ -650,7 +650,7 @@ int free_memtype(u64 start, u64 end)
        }
 
        spin_lock(&memtype_lock);
-       entry = rbt_memtype_erase(start, end);
+       entry = memtype_erase(start, end);
        spin_unlock(&memtype_lock);
 
        if (IS_ERR(entry)) {
@@ -693,7 +693,7 @@ static enum page_cache_mode lookup_memtype(u64 paddr)
 
        spin_lock(&memtype_lock);
 
-       entry = rbt_memtype_lookup(paddr);
+       entry = memtype_lookup(paddr);
        if (entry != NULL)
                rettype = entry->type;
        else
@@ -1109,7 +1109,7 @@ static struct memtype *memtype_get_idx(loff_t pos)
                return NULL;
 
        spin_lock(&memtype_lock);
-       ret = rbt_memtype_copy_nth_element(print_entry, pos);
+       ret = memtype_copy_nth_element(print_entry, pos);
        spin_unlock(&memtype_lock);
 
        if (!ret) {