Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7b4c965a0b74748269d05185a394c9dc121dd558
Commit:     7b4c965a0b74748269d05185a394c9dc121dd558
Parent:     2a0cc6885f34a8f1de195f718b9f51ece6923b80
Author:     Catalin Marinas <[EMAIL PROTECTED]>
AuthorDate: Fri Jul 20 11:42:57 2007 +0100
Committer:  Russell King <[EMAIL PROTECTED]>
CommitDate: Fri Jul 20 21:29:56 2007 +0100

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Russell King <[EMAIL PROTECTED]>
---
 arch/arm/mm/Kconfig             |    2 +-
 include/asm-arm/pgtable-nommu.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index cccacd9..d377376 100644
--- a/arch/arm/mm/Kconfig
+++ b/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/include/asm-arm/pgtable-nommu.h b/include/asm-arm/pgtable-nommu.h
index 0c8be19..1cf14d2 100644
--- a/include/asm-arm/pgtable-nommu.h
+++ b/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)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to