From 885dd8fc371b18ff76fd7b79a8f1f5af1f9dd2a3 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Tue, 21 Mar 2006 16:01:15 -0700 Subject: [PATCH] --- yaml --- r: 24813 b: refs/heads/master c: b9e71ac13a71bb435a4146d868080f5389bb906c h: refs/heads/master i: 24811: e5bbbe30d4bf9c0a6ca8af264edc109dbeaf3d51 v: v3 --- [refs] | 2 +- trunk/arch/parisc/kernel/entry.S | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ed932560cd05..eb8dea83bb3e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ba57583396585a1ca509e2a84d970a2ff3f9bbfb +refs/heads/master: b9e71ac13a71bb435a4146d868080f5389bb906c diff --git a/trunk/arch/parisc/kernel/entry.S b/trunk/arch/parisc/kernel/entry.S index 9af4b22a6d77..6d17c0a3431b 100644 --- a/trunk/arch/parisc/kernel/entry.S +++ b/trunk/arch/parisc/kernel/entry.S @@ -563,10 +563,10 @@ extrd,u,*= \pte,_PAGE_GATEWAY_BIT+32,1,%r0 depd %r0,11,2,\prot /* If Gateway, Set PL2 to 0 */ - /* Get rid of prot bits and convert to page addr for iitlbt */ + /* Get rid of prot bits and convert to page addr for iitlbt and idtlbt */ depd %r0,63,PAGE_SHIFT,\pte - extrd,u \pte,56,32,\pte + extrd,s \pte,(63-PAGE_SHIFT)+(63-58),64-PAGE_SHIFT,\pte .endm /* Identical macro to make_insert_tlb above, except it @@ -584,7 +584,7 @@ /* Get rid of prot bits and convert to page addr for iitlba */ - depi 0,31,12,\pte + depi 0,31,PAGE_SHIFT,\pte extru \pte,24,25,\pte .endm