---

yaml --- r: 25937 b: refs/heads/master c: f13b68e h: refs/heads/master i: 25935: 58b5be8 v: v3
git-mirror · Apr 19, 2006 · e8dffeb · e8dffeb
1 parent c9007e8
commit e8dffeb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41d4f0e61283f6807553c129416fc20766a7043f
+refs/heads/master: f13b68e8174657b0253ca7cf263521ed3ac19125
diff --git a/trunk/arch/mips/mm/highmem.c b/trunk/arch/mips/mm/highmem.c
@@ -83,6 +83,7 @@ void __kunmap_atomic(void *kvaddr, enum km_type type)
 	preempt_check_resched();
 }
 
+#ifndef CONFIG_LIMITED_DMA
 /*
  * This is the same as kmap_atomic() but can map memory that doesn't
  * have a struct page associated with it.
@@ -101,6 +102,7 @@ void *kmap_atomic_pfn(unsigned long pfn, enum km_type type)
 
 	return (void*) vaddr;
 }
+#endif /* CONFIG_LIMITED_DMA */
 
 struct page *__kmap_atomic_to_page(void *ptr)
 {