Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7a55fa6 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ee0049d4

arch/arm/include/asm/pgtable.h

+0 −2
Original line number Diff line number Diff line
@@ -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)

arch/arm/mm/proc-macros.S

+0 −6
Original line number Diff line number Diff line
@@ -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