Explorar el Código

[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>
Russell King hace 20 años
padre
commit
8711a1b902
Se han modificado 2 ficheros con 4 adiciones y 4 borrados
  1. 3 3
      arch/arm/mm/copypage-v4mc.c
  2. 1 1
      arch/arm/mm/mm-armv.c

+ 3 - 3
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);
 }

+ 1 - 1
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);
 }
 
 /*