Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi

[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 760bb31..1c92269 100644 (file)
--- a/mm/debug_vm_pgtable.c
+++ b/mm/debug_vm_pgtable.c
@@ -91,7 +91,7 @@ static void __init pte_advanced_tests(struct mm_struct *mm,
                                      unsigned long pfn, unsigned long vaddr,
                                      pgprot_t prot)
 {
-       pte_t pte = pfn_pte(pfn, prot);
+       pte_t pte;
 
        /*
         * Architectures optimize set_pte_at by avoiding TLB flush.
@@ -778,12 +778,12 @@ static void __init pmd_swap_soft_dirty_tests(unsigned long pfn, pgprot_t prot)
        WARN_ON(!pmd_swp_soft_dirty(pmd_swp_mksoft_dirty(pmd)));
        WARN_ON(pmd_swp_soft_dirty(pmd_swp_clear_soft_dirty(pmd)));
 }
-#else  /* !CONFIG_ARCH_HAS_PTE_DEVMAP */
+#else  /* !CONFIG_TRANSPARENT_HUGEPAGE */
 static void __init pmd_soft_dirty_tests(unsigned long pfn, pgprot_t prot) { }
 static void __init pmd_swap_soft_dirty_tests(unsigned long pfn, pgprot_t prot)
 {
 }
-#endif /* CONFIG_ARCH_HAS_PTE_DEVMAP */
+#endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 
 static void __init pte_swap_tests(unsigned long pfn, pgprot_t prot)
 {
@@ -843,17 +843,17 @@ static void __init swap_migration_tests(void)
         * locked, otherwise it stumbles upon a BUG_ON().
         */
        __SetPageLocked(page);
-       swp = make_migration_entry(page, 1);
+       swp = make_writable_migration_entry(page_to_pfn(page));
        WARN_ON(!is_migration_entry(swp));
-       WARN_ON(!is_write_migration_entry(swp));
+       WARN_ON(!is_writable_migration_entry(swp));
 
-       make_migration_entry_read(&swp);
+       swp = make_readable_migration_entry(swp_offset(swp));
        WARN_ON(!is_migration_entry(swp));
-       WARN_ON(is_write_migration_entry(swp));
+       WARN_ON(is_writable_migration_entry(swp));
 
-       swp = make_migration_entry(page, 0);
+       swp = make_readable_migration_entry(page_to_pfn(page));
        WARN_ON(!is_migration_entry(swp));
-       WARN_ON(is_write_migration_entry(swp));
+       WARN_ON(is_writable_migration_entry(swp));
        __ClearPageLocked(page);
        __free_page(page);
 }