diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-07-11 16:51:40 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-07-11 16:55:52 +0100 |
| commit | f7a55fa6ecef8be6d15bd79a803e44a3187ce9d6 (patch) | |
| tree | 92ef2f51f2564abc7e40cdc9f1ef2db966e28c0b | |
| parent | ee0049d49ad2556222a7b3127be2dae11982f7b3 (diff) | |
| download | linux-3.10-f7a55fa6ecef8be6d15bd79a803e44a3187ce9d6.tar.gz linux-3.10-f7a55fa6ecef8be6d15bd79a803e44a3187ce9d6.tar.bz2 linux-3.10-f7a55fa6ecef8be6d15bd79a803e44a3187ce9d6.zip | |
[ARM] remove L_PTE_BUFFERABLE and L_PTE_CACHEABLE
These old symbols are meaningless now that we have memory type
support implemented. The entire memory type field needs to be
modified rather than just a few bits twiddled.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/include/asm/pgtable.h | 2 | ||||
| -rw-r--r-- | arch/arm/mm/proc-macros.S | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index c433c6c7311..d575666d5c4 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h @@ -164,8 +164,6 @@ extern void __pgd_error(const char *file, int line, unsigned long val); #define L_PTE_PRESENT (1 << 0) #define L_PTE_FILE (1 << 1) /* only when !PRESENT */ #define L_PTE_YOUNG (1 << 1) -#define L_PTE_BUFFERABLE (1 << 2) /* obsolete, matches PTE */ -#define L_PTE_CACHEABLE (1 << 3) /* obsolete, matches PTE */ #define L_PTE_DIRTY (1 << 6) #define L_PTE_WRITE (1 << 7) #define L_PTE_USER (1 << 8) diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S index 54b1f721dec..a0b3f36f317 100644 --- a/arch/arm/mm/proc-macros.S +++ b/arch/arm/mm/proc-macros.S @@ -80,12 +80,6 @@ #if L_PTE_SHARED != PTE_EXT_SHARED #error PTE shared bit mismatch #endif -#if L_PTE_BUFFERABLE != PTE_BUFFERABLE -#error PTE bufferable bit mismatch -#endif -#if L_PTE_CACHEABLE != PTE_CACHEABLE -#error PTE cacheable bit mismatch -#endif #if (L_PTE_EXEC+L_PTE_USER+L_PTE_WRITE+L_PTE_DIRTY+L_PTE_YOUNG+\ L_PTE_FILE+L_PTE_PRESENT) > L_PTE_SHARED #error Invalid Linux PTE bit settings |