diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-03-26 20:29:40 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-03-26 20:29:40 +0300 |
commit | 5a54bd1307471c1cd0521402fe65e2057edcab2f (patch) | |
tree | 25fb6a543db4ccc11b6d5662ed2e7facfce39ae7 /arch/powerpc/include/asm/pgtable-4k.h | |
parent | f9f35677d81adb0feedcd6e0e661784805c8facd (diff) | |
parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
download | linux-5a54bd1307471c1cd0521402fe65e2057edcab2f.tar.xz |
Merge commit 'v2.6.29' into core/header-fixes
Diffstat (limited to 'arch/powerpc/include/asm/pgtable-4k.h')
-rw-r--r-- | arch/powerpc/include/asm/pgtable-4k.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/pgtable-4k.h b/arch/powerpc/include/asm/pgtable-4k.h index 6b18ba9d2d85..1dbca4e7de67 100644 --- a/arch/powerpc/include/asm/pgtable-4k.h +++ b/arch/powerpc/include/asm/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_HPTEFLAGS | _PAGE_SPECIAL) /* Bits to mask out from a PMD to get to the PTE page */ #define PMD_MASKED_BITS 0 |