From 3f63ebb5c029834954197913300383a3f30261a5 Mon Sep 17 00:00:00 2001 From: Paul Mackerras Date: Wed, 18 Jun 2008 16:40:35 +1000 Subject: [PATCH] --- yaml --- r: 98254 b: refs/heads/master c: 65ba6cdc837af9b77354d03987354196ac4eb308 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/hash_low_64.S | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 51544097150f..cf5dd6d789e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b17879f71c2eb4a10f5a63918819d9d572b23a9a +refs/heads/master: 65ba6cdc837af9b77354d03987354196ac4eb308 diff --git a/trunk/arch/powerpc/mm/hash_low_64.S b/trunk/arch/powerpc/mm/hash_low_64.S index 21d248486479..70f4c833fa32 100644 --- a/trunk/arch/powerpc/mm/hash_low_64.S +++ b/trunk/arch/powerpc/mm/hash_low_64.S @@ -568,6 +568,10 @@ htab_inval_old_hpte: ld r7,STK_PARM(r9)(r1) /* ssize */ ld r8,STK_PARM(r8)(r1) /* local */ bl .flush_hash_page + /* Clear out _PAGE_HPTE_SUB bits in the new linux PTE */ + lis r0,_PAGE_HPTE_SUB@h + ori r0,r0,_PAGE_HPTE_SUB@l + andc r30,r30,r0 b htab_insert_pte htab_bail_ok: