aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-05-16 18:36:22 -0400
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-05-16 18:36:22 -0400
commit8711a1b902e691c9b3bbd0d0624f836abe9641ca (patch)
tree588af68788e56f7e0e6132e52c35af4abcdb4c93
parent768cbfbc5273bad91afe12b81471f563b288118a (diff)
[PATCH] ARM: Fix build error
Mainline kernels don't have VECTORS_HIGH nor COPYPAGE_MINICACHE yet. Signed-off-by: Russell King <rmk@arm.linux.org.uk>
-rw-r--r--arch/arm/mm/copypage-v4mc.c6
-rw-r--r--arch/arm/mm/mm-armv.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mm/copypage-v4mc.c b/arch/arm/mm/copypage-v4mc.c
index 16384a7600a1..fc69dccdace1 100644
--- a/arch/arm/mm/copypage-v4mc.c
+++ b/arch/arm/mm/copypage-v4mc.c
@@ -71,10 +71,10 @@ void v4_mc_copy_user_page(void *kto, const void *kfrom, unsigned long vaddr)
71{ 71{
72 spin_lock(&minicache_lock); 72 spin_lock(&minicache_lock);
73 73
74 set_pte(TOP_PTE(COPYPAGE_MINICACHE), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot)); 74 set_pte(TOP_PTE(0xffff8000), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot));
75 flush_tlb_kernel_page(COPYPAGE_MINICACHE); 75 flush_tlb_kernel_page(0xffff8000);
76 76
77 mc_copy_user_page((void *)COPYPAGE_MINICACHE, kto); 77 mc_copy_user_page((void *)0xffff8000, kto);
78 78
79 spin_unlock(&minicache_lock); 79 spin_unlock(&minicache_lock);
80} 80}
diff --git a/arch/arm/mm/mm-armv.c b/arch/arm/mm/mm-armv.c
index fa60fd65fcf8..2c2b93d77d43 100644
--- a/arch/arm/mm/mm-armv.c
+++ b/arch/arm/mm/mm-armv.c
@@ -685,7 +685,7 @@ void __init memtable_init(struct meminfo *mi)
685 flush_cache_all(); 685 flush_cache_all();
686 flush_tlb_all(); 686 flush_tlb_all();
687 687
688 top_pmd = pmd_off_k(VECTORS_HIGH); 688 top_pmd = pmd_off_k(0xffff0000);
689} 689}
690 690
691/* 691/*