Re: [PATCH 4/4] x86: use pte_none() to test for empty PTE

[Julia Lawall]

My results are below.  There are a couple of cases in arch/mn10300/mm that
were not in the original patch.

julia

diff -u -p a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c
--- a/arch/x86/mm/pageattr.c
+++ b/arch/x86/mm/pageattr.c
@@ -1185,7 +1185,7 @@ repeat:
                return __cpa_process_fault(cpa, address, primary);

        old_pte = *kpte;
-       if (!pte_val(old_pte))
+       if (pte_none(old_pte))
                return __cpa_process_fault(cpa, address, primary);

        if (level == PG_LEVEL_4K) {
diff -u -p a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@ -354,7 +354,7 @@ phys_pte_init(pte_t *pte_page, unsigned
                 * pagetable pages as RO. So assume someone who pre-setup
                 * these mappings are more intelligent.
                 */
-               if (pte_val(*pte)) {
+               if (!pte_none(*pte)) {
                        if (!after_bootmem)
                                pages++;
                        continue;
@@ -396,7 +396,7 @@ phys_pmd_init(pmd_t *pmd_page, unsigned
                        continue;
                }

-               if (pmd_val(*pmd)) {
+               if (!pmd_none(*pmd)) {
                        if (!pmd_large(*pmd)) {
                                spin_lock(&init_mm.page_table_lock);
                                pte = (pte_t *)pmd_page_vaddr(*pmd);
@@ -470,7 +470,7 @@ phys_pud_init(pud_t *pud_page, unsigned
                        continue;
                }

-               if (pud_val(*pud)) {
+               if (!pud_none(*pud)) {
                        if (!pud_large(*pud)) {
                                pmd = pmd_offset(pud, 0);
                                last_map_addr = phys_pmd_init(pmd, addr, end,
@@ -673,7 +673,7 @@ static void __meminit free_pte_table(pte

        for (i = 0; i < PTRS_PER_PTE; i++) {
                pte = pte_start + i;
-               if (pte_val(*pte))
+               if (!pte_none(*pte))
                        return;
        }

@@ -691,7 +691,7 @@ static void __meminit free_pmd_table(pmd

        for (i = 0; i < PTRS_PER_PMD; i++) {
                pmd = pmd_start + i;
-               if (pmd_val(*pmd))
+               if (!pmd_none(*pmd))
                        return;
        }

@@ -710,7 +710,7 @@ static bool __meminit free_pud_table(pud

        for (i = 0; i < PTRS_PER_PUD; i++) {
                pud = pud_start + i;
-               if (pud_val(*pud))
+               if (!pud_none(*pud))
                        return false;
        }

diff -u -p a/arch/x86/mm/pgtable_32.c b/arch/x86/mm/pgtable_32.c
--- a/arch/x86/mm/pgtable_32.c
+++ b/arch/x86/mm/pgtable_32.c
@@ -47,7 +47,7 @@ void set_pte_vaddr(unsigned long vaddr,
                return;
        }
        pte = pte_offset_kernel(pmd, vaddr);
-       if (pte_val(pteval))
+       if (!pte_none(pteval))
                set_pte_at(&init_mm, vaddr, pte, pteval);
        else
                pte_clear(&init_mm, vaddr, pte);
diff -u -p a/arch/mn10300/mm/cache-flush-icache.c 
b/arch/mn10300/mm/cache-flush-icache.c
--- a/arch/mn10300/mm/cache-flush-icache.c
+++ b/arch/mn10300/mm/cache-flush-icache.c
@@ -67,11 +67,11 @@ static void flush_icache_page_range(unsi
                return;

        pud = pud_offset(pgd, start);
-       if (!pud || !pud_val(*pud))
+       if (!pud || pud_none(*pud))
                return;

        pmd = pmd_offset(pud, start);
-       if (!pmd || !pmd_val(*pmd))
+       if (!pmd || pmd_none(*pmd))
                return;

        ppte = pte_offset_map(pmd, start);
diff -u -p a/arch/mn10300/mm/cache-inv-icache.c 
b/arch/mn10300/mm/cache-inv-icache.c
--- a/arch/mn10300/mm/cache-inv-icache.c
+++ b/arch/mn10300/mm/cache-inv-icache.c
@@ -45,11 +45,11 @@ static void flush_icache_page_range(unsi
                return;

        pud = pud_offset(pgd, start);
-       if (!pud || !pud_val(*pud))
+       if (!pud || pud_none(*pud))
                return;

        pmd = pmd_offset(pud, start);
-       if (!pmd || !pmd_val(*pmd))
+       if (!pmd || pmd_none(*pmd))
                return;

        ppte = pte_offset_map(pmd, start);