aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2005-05-16 23:36:22 +0100
committerRussell King <rmk@dyn-67.arm.linux.org.uk>2005-05-16 23:36:22 +0100
commit8711a1b902e691c9b3bbd0d0624f836abe9641ca (patch)
tree588af68788e56f7e0e6132e52c35af4abcdb4c93 /arch/arm
parentAutomatic merge of master.kernel.org:/home/rmk/linux-2.6-serial.git (diff)
downloadlinux-dev-8711a1b902e691c9b3bbd0d0624f836abe9641ca.tar.xz
linux-dev-8711a1b902e691c9b3bbd0d0624f836abe9641ca.zip
[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>
Diffstat (limited to 'arch/arm')
-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)
{
spin_lock(&minicache_lock);
- set_pte(TOP_PTE(COPYPAGE_MINICACHE), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot));
- flush_tlb_kernel_page(COPYPAGE_MINICACHE);
+ set_pte(TOP_PTE(0xffff8000), pfn_pte(__pa(kfrom) >> PAGE_SHIFT, minicache_pgprot));
+ flush_tlb_kernel_page(0xffff8000);
- mc_copy_user_page((void *)COPYPAGE_MINICACHE, kto);
+ mc_copy_user_page((void *)0xffff8000, kto);
spin_unlock(&minicache_lock);
}
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)
flush_cache_all();
flush_tlb_all();
- top_pmd = pmd_off_k(VECTORS_HIGH);
+ top_pmd = pmd_off_k(0xffff0000);
}
/*