diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 23:59:55 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-29 23:59:55 -0400 |
commit | 92dd7ca0af8f769569bde98a83b4a8f4daec6ac5 (patch) | |
tree | 9217bee214128a4a45b2e0a3d9784d05fea2c8fb /arch/arm/mm/mm-armv.c | |
parent | 164cad9bacc2cf190493d2ee4918dc2869ba6f53 (diff) | |
parent | da41119af78864d27ccbf505949df788d5e8aaf5 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mm/mm-armv.c')
-rw-r--r-- | arch/arm/mm/mm-armv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c index 052ab443ec4e..c3bd503b43a2 100644 --- a/arch/arm/mm/mm-armv.c +++ b/arch/arm/mm/mm-armv.c | |||
@@ -682,7 +682,7 @@ void __init memtable_init(struct meminfo *mi) | |||
682 | } | 682 | } |
683 | 683 | ||
684 | flush_cache_all(); | 684 | flush_cache_all(); |
685 | flush_tlb_all(); | 685 | local_flush_tlb_all(); |
686 | 686 | ||
687 | top_pmd = pmd_off_k(0xffff0000); | 687 | top_pmd = pmd_off_k(0xffff0000); |
688 | } | 688 | } |