Merge tag 'iwlwifi-for-kalle-2016-04-12_2' of https://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / arch / powerpc / mm / hash64_64k.c

diff --git a/arch/powerpc/mm/hash64_64k.c b/arch/powerpc/mm/hash64_64k.c
index edb0991..b2d659c 100644 (file)
--- a/arch/powerpc/mm/hash64_64k.c
+++ b/arch/powerpc/mm/hash64_64k.c
@@ -188,7 +188,7 @@ repeat:
                }
        }
        /*
-        * Hypervisor failure. Restore old pmd and return -1
+        * Hypervisor failure. Restore old pte and return -1
         * similar to __hash_page_*
         */
        if (unlikely(slot == -2)) {
@@ -249,8 +249,7 @@ int __hash_page_64K(unsigned long ea, unsigned long access,
                        return 0;
                /*
                 * Try to lock the PTE, add ACCESSED and DIRTY if it was
-                * a write access. Since this is 4K insert of 64K page size
-                * also add _PAGE_COMBO
+                * a write access.
                 */
                new_pte = old_pte | _PAGE_BUSY | _PAGE_ACCESSED;
                if (access & _PAGE_RW)
@@ -311,7 +310,7 @@ repeat:
                        }
                }
                /*
-                * Hypervisor failure. Restore old pmd and return -1
+                * Hypervisor failure. Restore old pte and return -1
                 * similar to __hash_page_*
                 */
                if (unlikely(slot == -2)) {