---

yaml --- r: 98254 b: refs/heads/master c: 65ba6cd h: refs/heads/master v: v3
git-mirror · Jun 18, 2008 · 3f63ebb · 3f63ebb
1 parent 3a25623
commit 3f63ebb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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: