Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / mm / debug_vm_pgtable.c

diff --git a/mm/debug_vm_pgtable.c b/mm/debug_vm_pgtable.c
index 1403639..a7ac97c 100644 (file)
--- a/mm/debug_vm_pgtable.c
+++ b/mm/debug_vm_pgtable.c
@@ -652,7 +652,7 @@ static void __init pte_clear_tests(struct pgtable_debug_args *args)
        set_pte_at(args->mm, args->vaddr, args->ptep, pte);
        flush_dcache_page(page);
        barrier();
-       pte_clear(args->mm, args->vaddr, args->ptep);
+       ptep_clear(args->mm, args->vaddr, args->ptep);
        pte = ptep_get(args->ptep);
        WARN_ON(!pte_none(pte));
 }
@@ -888,8 +888,8 @@ static void __init swap_migration_tests(struct pgtable_debug_args *args)
        pr_debug("Validating swap migration\n");
 
        /*
-        * make_migration_entry() expects given page to be
-        * locked, otherwise it stumbles upon a BUG_ON().
+        * make_[readable|writable]_migration_entry() expects given page to
+        * be locked, otherwise it stumbles upon a BUG_ON().
         */
        __SetPageLocked(page);
        swp = make_writable_migration_entry(page_to_pfn(page));
@@ -1104,13 +1104,14 @@ static int __init init_args(struct pgtable_debug_args *args)
        /*
         * Initialize the debugging data.
         *
-        * __P000 (or even __S000) will help create page table entries with
-        * PROT_NONE permission as required for pxx_protnone_tests().
+        * protection_map[0] (or even protection_map[8]) will help create
+        * page table entries with PROT_NONE permission as required for
+        * pxx_protnone_tests().
         */
        memset(args, 0, sizeof(*args));
        args->vaddr              = get_random_vaddr();
        args->page_prot          = vm_get_page_prot(VMFLAGS);
-       args->page_prot_none     = __P000;
+       args->page_prot_none     = protection_map[0];
        args->is_contiguous_page = false;
        args->pud_pfn            = ULONG_MAX;
        args->pmd_pfn            = ULONG_MAX;