diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 21:54:53 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-22 22:01:40 +0200 |
| commit | ae19ffbadc1b2100285a5b5b3d0a4e0a11390904 (patch) | |
| tree | 3c2086ab67398a019089a47ca3f362a4bc6db74f /arch/powerpc/include/asm/pte-fsl-booke.h | |
| parent | ARM: 5721/1: MMCI enable the use of a regulator (diff) | |
| parent | ARM: 5719/1: [AT91] Fix AC97 breakage (diff) | |
| download | linux-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.tar.xz linux-ae19ffbadc1b2100285a5b5b3d0a4e0a11390904.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'arch/powerpc/include/asm/pte-fsl-booke.h')
| -rw-r--r-- | arch/powerpc/include/asm/pte-fsl-booke.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/arch/powerpc/include/asm/pte-fsl-booke.h b/arch/powerpc/include/asm/pte-fsl-booke.h index 10820f58acf5..2c12be5f677a 100644 --- a/arch/powerpc/include/asm/pte-fsl-booke.h +++ b/arch/powerpc/include/asm/pte-fsl-booke.h @@ -23,7 +23,7 @@ #define _PAGE_FILE 0x00002 /* S: when !present: nonlinear file mapping */ #define _PAGE_RW 0x00004 /* S: Write permission (SW) */ #define _PAGE_DIRTY 0x00008 /* S: Page dirty */ -#define _PAGE_HWEXEC 0x00010 /* H: SX permission */ +#define _PAGE_EXEC 0x00010 /* H: SX permission */ #define _PAGE_ACCESSED 0x00020 /* S: Page referenced */ #define _PAGE_ENDIAN 0x00040 /* H: E bit */ @@ -33,13 +33,6 @@ #define _PAGE_WRITETHRU 0x00400 /* H: W bit */ #define _PAGE_SPECIAL 0x00800 /* S: Special page */ -#ifdef CONFIG_PTE_64BIT -/* ERPN in a PTE never gets cleared, ignore it */ -#define _PTE_NONE_MASK 0xffffffffffff0000ULL -/* We extend the size of the PTE flags area when using 64-bit PTEs */ -#define PTE_RPN_SHIFT (PAGE_SHIFT + 8) -#endif - #define _PMD_PRESENT 0 #define _PMD_PRESENT_MASK (PAGE_MASK) #define _PMD_BAD (~PAGE_MASK) |