From c7c9efaf6cf9201b35104eeafb3c21b4af3a27b6 Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@gmx.de>
Date: Sun, 18 Jan 2009 19:30:18 +0100
Subject: [PATCH] --- yaml --- r: 140031 b: refs/heads/master c:
 1152a68c4226ce48c95241b6ffc543850b4b3a97 h: refs/heads/master i:   140029:
 9636880d6a6f61a8188036c79825334834ab3ecc   140027:
 5d147d69b3745c98c135d2673497f83a57f103f0   140023:
 f2ee9abbc1f64ef9907bf70b7000bc76f8ffd5ef   140015:
 443c6a1766161cc1c862b82272e03c22f02e46ce   139999:
 4e3344476e15e833e954045e648d098e1e2a9a56   139967:
 4da5d68d09e3b4bcc97c339a604c7ea825bde090   139903:
 2158388d97d97bd4ba0c0b4df997ffccfff11c1c   139775:
 358f40954a177056b274ebff230831d79f0fd2c5 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/parisc/kernel/entry.S | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 2b674b2ea67d..45462f04ff6f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 48d27cb2299c0b2fc4d551bddb6a1005828dc0c6
+refs/heads/master: 1152a68c4226ce48c95241b6ffc543850b4b3a97
diff --git a/trunk/arch/parisc/kernel/entry.S b/trunk/arch/parisc/kernel/entry.S
index 0db9fdcb7709..0f7ff938b06a 100644
--- a/trunk/arch/parisc/kernel/entry.S
+++ b/trunk/arch/parisc/kernel/entry.S
@@ -563,8 +563,8 @@
 
 	/* Get rid of prot bits and convert to page addr for iitlba */
 
-	depi		_PAGE_SIZE_ENCODING_DEFAULT,31,ASM_PFN_PTE_SHIFT,\pte
-	extru		\pte,24,25,\pte
+	depi		0,31,ASM_PFN_PTE_SHIFT,\pte
+	SHRREG		\pte,(ASM_PFN_PTE_SHIFT-(31-26)),\pte
 	.endm
 
 	/* This is for ILP32 PA2.0 only.  The TLB insertion needs
@@ -1337,8 +1337,8 @@ nadtlb_check_flush_11:
 
 	/* Get rid of prot bits and convert to page addr for idtlba */
 
-	depi		0,31,12,pte
-	extru		pte,24,25,pte
+	depi		0,31,ASM_PFN_PTE_SHIFT,pte
+	SHRREG		pte,(ASM_PFN_PTE_SHIFT-(31-26)),pte
 
 	mfsp		%sr1,t0  /* Save sr1 so we can use it in tlb inserts */
 	mtsp		spc,%sr1