Commit 0df162e1 authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer
Browse files

MIPS: mm: Clean up setup of protection map 



Protection map difference between RIXI and non RIXI cpus is _PAGE_NO_EXEC
and _PAGE_NO_READ usage. Both already take care of cpu_has_rixi while
setting up the page bits. So we just need one setup of protection map
and can drop the now unused (and broken for RIXI) PAGE_* defines.

Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent ed2adb74

arch/mips/include/asm/pgtable.h

+0 −8
Original line number Diff line number Diff line
@@ -25,14 +25,6 @@ 
struct mm_struct;

struct vm_area_struct;



#define PAGE_NONE	__pgprot(_PAGE_PRESENT | _PAGE_NO_READ | \

				 _page_cachable_default)

#define PAGE_SHARED	__pgprot(_PAGE_PRESENT | _PAGE_WRITE | \

				 _page_cachable_default)

#define PAGE_COPY	__pgprot(_PAGE_PRESENT | _PAGE_NO_EXEC | \

				 _page_cachable_default)

#define PAGE_READONLY	__pgprot(_PAGE_PRESENT | \

				 _page_cachable_default)

#define PAGE_KERNEL	__pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \

				 _PAGE_GLOBAL | _page_cachable_default)

#define PAGE_KERNEL_NC	__pgprot(_PAGE_PRESENT | __READABLE | __WRITEABLE | \

arch/mips/mm/cache.c

+18 −37
Original line number Diff line number Diff line
@@ -159,7 +159,6 @@ EXPORT_SYMBOL(_page_cachable_default); 


static inline void setup_protection_map(void)

{

	if (cpu_has_rixi) {

	protection_map[0]  = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);

	protection_map[1]  = PM(_PAGE_PRESENT | _PAGE_NO_EXEC);

	protection_map[2]  = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);
@@ -171,31 +170,13 @@ static inline void setup_protection_map(void) 


	protection_map[8]  = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_NO_READ);

	protection_map[9]  = PM(_PAGE_PRESENT | _PAGE_NO_EXEC);

		protection_map[10] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE | _PAGE_NO_READ);

	protection_map[10] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE |

				_PAGE_NO_READ);

	protection_map[11] = PM(_PAGE_PRESENT | _PAGE_NO_EXEC | _PAGE_WRITE);

	protection_map[12] = PM(_PAGE_PRESENT);

	protection_map[13] = PM(_PAGE_PRESENT);

	protection_map[14] = PM(_PAGE_PRESENT | _PAGE_WRITE);

	protection_map[15] = PM(_PAGE_PRESENT | _PAGE_WRITE);



	} else {

		protection_map[0] = PAGE_NONE;

		protection_map[1] = PAGE_READONLY;

		protection_map[2] = PAGE_COPY;

		protection_map[3] = PAGE_COPY;

		protection_map[4] = PAGE_READONLY;

		protection_map[5] = PAGE_READONLY;

		protection_map[6] = PAGE_COPY;

		protection_map[7] = PAGE_COPY;

		protection_map[8] = PAGE_NONE;

		protection_map[9] = PAGE_READONLY;

		protection_map[10] = PAGE_SHARED;

		protection_map[11] = PAGE_SHARED;

		protection_map[12] = PAGE_READONLY;

		protection_map[13] = PAGE_READONLY;

		protection_map[14] = PAGE_SHARED;

		protection_map[15] = PAGE_SHARED;

	}

}



#undef PM