diff options
author | Paul Mackerras <paulus@samba.org> | 2016-02-22 03:41:12 +0100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-02-27 11:06:57 +0100 |
commit | 1ec3f937102154b54c3ba97b79d4bd3931bb0eaa (patch) | |
tree | fe1d48d2cac53135d9ffc8fd77f8c073ac7c070a /arch/powerpc/mm | |
parent | Merge tag 'powerpc-4.5-4' into next (diff) | |
download | linux-1ec3f937102154b54c3ba97b79d4bd3931bb0eaa.tar.xz linux-1ec3f937102154b54c3ba97b79d4bd3931bb0eaa.zip |
powerpc/mm/book3s-64: Clean up some obsolete or misleading comments
No code changes.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/mm')
-rw-r--r-- | arch/powerpc/mm/hash64_64k.c | 3 | ||||
-rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/arch/powerpc/mm/hash64_64k.c b/arch/powerpc/mm/hash64_64k.c index edb09912f0c9..ef6fac6d773c 100644 --- a/arch/powerpc/mm/hash64_64k.c +++ b/arch/powerpc/mm/hash64_64k.c @@ -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) diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index ba59d5977f34..47a0bc12cb65 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -168,11 +168,11 @@ unsigned long htab_convert_pte_flags(unsigned long pteflags) rflags |= HPTE_R_N; /* * PP bits: - * Linux use slb key 0 for kernel and 1 for user. - * kernel areas are mapped by PP bits 00 - * and and there is no kernel RO (_PAGE_KERNEL_RO). - * User area mapped by 0x2 and read only use by - * 0x3. + * Linux uses slb key 0 for kernel and 1 for user. + * kernel areas are mapped with PP=00 + * and there is no kernel RO (_PAGE_KERNEL_RO). + * User area is mapped with PP=0x2 for read/write + * or PP=0x3 for read-only (including writeable but clean pages). */ if (pteflags & _PAGE_USER) { rflags |= 0x2; |