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

Commit 8107338b authored by Deepak Saxena's avatar Deepak Saxena Committed by Russell King
Browse files

[PATCH] ARM: 2796/1: Fix ARMv5[TEJ] check in MMU initalization 



Patch from Deepak Saxena

The code in mm-armv.c checks for the condition (cpu_architecture()<= ARMv5)
in a few places but should be checking for ARMv5TEJ as the MMU is shared
across all v5 variations.

Signed-off-by: default avatarDeepak Saxena <dsaxena@plexity.net>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4bebdab7

arch/arm/mm/mm-armv.c

+2 −2
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static void __init build_mem_type_table(void) 
		ecc_mask = 0;

	}



	if (cpu_arch <= CPU_ARCH_ARMv5) {

	if (cpu_arch <= CPU_ARCH_ARMv5TEJ) {

		for (i = 0; i < ARRAY_SIZE(mem_types); i++) {

			if (mem_types[i].prot_l1)

				mem_types[i].prot_l1 |= PMD_BIT4;
@@ -584,7 +584,7 @@ void setup_mm_for_reboot(char mode) 
		pmdval = (i << PGDIR_SHIFT) |

			 PMD_SECT_AP_WRITE | PMD_SECT_AP_READ |

			 PMD_TYPE_SECT;

		if (cpu_arch <= CPU_ARCH_ARMv5)

		if (cpu_arch <= CPU_ARCH_ARMv5TEJ)

			pmdval |= PMD_BIT4;

		pmd = pmd_off(pgd, i << PGDIR_SHIFT);

		pmd[0] = __pmd(pmdval);