From 7d7bdbb0f656de7ad83ae4fb83efbb1d3bfae4f2 Mon Sep 17 00:00:00 2001 From: Catalin Marinas Date: Fri, 20 Jul 2007 11:42:57 +0100 Subject: [PATCH] --- yaml --- r: 62650 b: refs/heads/master c: 7b4c965a0b74748269d05185a394c9dc121dd558 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mm/Kconfig | 2 +- trunk/include/asm-arm/pgtable-nommu.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 118e3cc3ffd1..a324238e9fa2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2a0cc6885f34a8f1de195f718b9f51ece6923b80 +refs/heads/master: 7b4c965a0b74748269d05185a394c9dc121dd558 diff --git a/trunk/arch/arm/mm/Kconfig b/trunk/arch/arm/mm/Kconfig index cccacd9c95af..d377376d6eed 100644 --- a/trunk/arch/arm/mm/Kconfig +++ b/trunk/arch/arm/mm/Kconfig @@ -351,7 +351,7 @@ config CPU_V6 select CPU_CACHE_V6 select CPU_CACHE_VIPT select CPU_CP15_MMU - select CPU_HAS_ASID + select CPU_HAS_ASID if MMU select CPU_COPY_V6 if MMU select CPU_TLB_V6 if MMU diff --git a/trunk/include/asm-arm/pgtable-nommu.h b/trunk/include/asm-arm/pgtable-nommu.h index 0c8be19fd66b..1cf14d243e82 100644 --- a/trunk/include/asm-arm/pgtable-nommu.h +++ b/trunk/include/asm-arm/pgtable-nommu.h @@ -102,7 +102,7 @@ extern int is_in_rom(unsigned long); #define v4_tlb_fns (0) #define v4wb_tlb_fns (0) #define v4wbi_tlb_fns (0) -#define v6_tlb_fns (0) +#define v6wbi_tlb_fns (0) #define v3_user_fns (0) #define v4_user_fns (0)