[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>

diff --git a/arch/arm/mm/copypage-v4mc.c b/arch/arm/mm/copypage-v4mc.c
index 16384a7600a1e780cffc6f8e4e5227cf29fa9fb2..fc69dccdace19cdf7ee6d0f3212318698bc88666 100644 (file)
--- 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 fa60fd65fcf844c995411156e8a5c169f6abad2e..2c2b93d77d433248dba64b6a1dd525eae51277fc 100644 (file)
--- 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);
 }
 
 /*