---

yaml --- r: 318946 b: refs/heads/master c: 5bbeed1 h: refs/heads/master v: v3
git-mirror · Jul 26, 2012 · 1d9a4e5 · 1d9a4e5
1 parent 3b341db
commit 1d9a4e5
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 20 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 881e02d298451e1788669662e72ccfd69859dae5
+refs/heads/master: 5bbeed12bdc3eaebe963cda2bf8039c37cbe2235
diff --git a/trunk/arch/sparc/include/asm/highmem.h b/trunk/arch/sparc/include/asm/highmem.h
@@ -72,7 +72,6 @@ static inline void kunmap(struct page *page)
 
 extern void *kmap_atomic(struct page *page);
 extern void __kunmap_atomic(void *kvaddr);
-extern struct page *kmap_atomic_to_page(void *vaddr);
 
 #define flush_cache_kmaps()	flush_cache_all()
 

diff --git a/trunk/arch/sparc/mm/highmem.c b/trunk/arch/sparc/mm/highmem.c
@@ -110,21 +110,3 @@ void __kunmap_atomic(void *kvaddr)
 	pagefault_enable();
 }
 EXPORT_SYMBOL(__kunmap_atomic);
-
-/* We may be fed a pagetable here by ptep_to_xxx and others. */
-struct page *kmap_atomic_to_page(void *ptr)
-{
-	unsigned long idx, vaddr = (unsigned long)ptr;
-	pte_t *pte;
-
-	if (vaddr < SRMMU_NOCACHE_VADDR)
-		return virt_to_page(ptr);
-	if (vaddr < PKMAP_BASE)
-		return pfn_to_page(__nocache_pa(vaddr) >> PAGE_SHIFT);
-	BUG_ON(vaddr < FIXADDR_START);
-	BUG_ON(vaddr > FIXADDR_TOP);
-
-	idx = virt_to_fix(vaddr);
-	pte = kmap_pte - (idx - FIX_KMAP_BEGIN);
-	return pte_page(*pte);
-}