Messages in this thread Patch in this message | | | From | Nick Piggin <> | Subject | Re: Lockless/Get_User_Pages_Fast causes Xorg 1.4.99.* to lock | Date | Mon, 7 Jul 2008 17:55:39 +1000 |
| |
On Saturday 05 July 2008 06:29, Hugh Dickins wrote:
> Fix to 2.6.26-rc8-mm1 x86-implement-pte_special.patch > Perhaps something similar needed for powerpc? Nick will know.
Here is the required fix for powerpc-implement-pte_special.patch
Spotted by Hugh:
Stop mprotect's pte_modify from wiping out the powerpc pte_special bit, which caused oops thereafter when vm_normal_page thought X's abnormal was normal.
Signed-off-by: Nick Piggin <npiggin@suse.de> --- Index: linux-2.6/include/asm-powerpc/pgtable-4k.h =================================================================== --- linux-2.6.orig/include/asm-powerpc/pgtable-4k.h +++ linux-2.6/include/asm-powerpc/pgtable-4k.h @@ -60,7 +60,7 @@ /* It should be preserving the high 48 bits and then specifically */ /* preserving _PAGE_SECONDARY | _PAGE_GROUP_IX */ #define _PAGE_CHG_MASK (PAGE_MASK | _PAGE_ACCESSED | _PAGE_DIRTY | \ - _PAGE_HPTEFLAGS) + _PAGE_SPECIAL | _PAGE_HPTEFLAGS) /* Bits to mask out from a PMD to get to the PTE page */ #define PMD_MASKED_BITS 0 | |