tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ARM] 4504/1: nommu: Fix the ARMv6 support for MMU-less platforms

With this patch, Kconfig only selects CPU_HAS_ASID for the MMU
case. It also corrects the typo in the v6wbi_tlb_fns definition in
pgtable-nommu.h.

Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by Catalin Marinas and committed by Russell King 7b4c965a 2a0cc688

+2 -2
unified split
+1 -1
arch/arm/mm/Kconfig
··· 351 351 select CPU_CACHE_V6 352 352 select CPU_CACHE_VIPT 353 353 select CPU_CP15_MMU 354 - select CPU_HAS_ASID 354 + select CPU_HAS_ASID if MMU 355 355 select CPU_COPY_V6 if MMU 356 356 select CPU_TLB_V6 if MMU 357 357
+1 -1
include/asm-arm/pgtable-nommu.h
··· 102 102 #define v4_tlb_fns (0) 103 103 #define v4wb_tlb_fns (0) 104 104 #define v4wbi_tlb_fns (0) 105 - #define v6_tlb_fns (0) 105 + #define v6wbi_tlb_fns (0) 106 106 107 107 #define v3_user_fns (0) 108 108 #define v4_user_fns (0)