

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 25-akpm/arch/i386/mm/highmem.c     |    2 +-
 25-akpm/include/asm-i386/highmem.h |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/i386/mm/highmem.c~kmap_atomic-takes-char-fix arch/i386/mm/highmem.c
--- 25/arch/i386/mm/highmem.c~kmap_atomic-takes-char-fix	2004-11-30 01:23:06.308808024 -0800
+++ 25-akpm/arch/i386/mm/highmem.c	2004-11-30 01:23:06.313807264 -0800
@@ -74,7 +74,7 @@ void kunmap_atomic(char *kaddr, enum km_
 	preempt_check_resched();
 }
 
-struct page *kmap_atomic_to_page(void *ptr)
+struct page *kmap_atomic_to_page(char *ptr)
 {
 	unsigned long idx, vaddr = (unsigned long)ptr;
 	pte_t *pte;
diff -puN include/asm-i386/highmem.h~kmap_atomic-takes-char-fix include/asm-i386/highmem.h
--- 25/include/asm-i386/highmem.h~kmap_atomic-takes-char-fix	2004-11-30 01:23:06.309807872 -0800
+++ 25-akpm/include/asm-i386/highmem.h	2004-11-30 01:23:06.314807112 -0800
@@ -72,7 +72,7 @@ void *kmap(struct page *page);
 void kunmap(struct page *page);
 char *kmap_atomic(struct page *page, enum km_type type);
 void kunmap_atomic(char *kvaddr, enum km_type type);
-struct page *kmap_atomic_to_page(void *ptr);
+struct page *kmap_atomic_to_page(char *ptr);
 
 #define flush_cache_kmaps()	do { } while (0)
 
_
