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

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

diff -puN arch/i386/mm/highmem.c~crashdump-routines-for-copying-dump-pages-kmap-fiddle arch/i386/mm/highmem.c
--- 25/arch/i386/mm/highmem.c~crashdump-routines-for-copying-dump-pages-kmap-fiddle	2004-11-10 20:06:02.596078904 -0800
+++ 25-akpm/arch/i386/mm/highmem.c	2004-11-10 20:06:02.603077840 -0800
@@ -77,7 +77,7 @@ void kunmap_atomic(char *kaddr, enum km_
 /* This is the same as kmap_atomic() but can map memory that doesn't
  * have a struct page associated with it.
  */
-void *kmap_atomic_pfn(unsigned long pfn, enum km_type type)
+char *kmap_atomic_pfn(unsigned long pfn, enum km_type type)
 {
         enum fixed_addresses idx;
         unsigned long vaddr;
@@ -89,10 +89,10 @@ void *kmap_atomic_pfn(unsigned long pfn,
         set_pte(kmap_pte-idx, pfn_pte(pfn, kmap_prot));
         __flush_tlb_one(vaddr);
 
-        return (void*) vaddr;
+        return (char *)vaddr;
 }
 
-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;
@@ -104,4 +104,3 @@ struct page *kmap_atomic_to_page(void *p
 	pte = kmap_pte - (idx - FIX_KMAP_BEGIN);
 	return pte_page(*pte);
 }
-
diff -puN include/linux/highmem.h~crashdump-routines-for-copying-dump-pages-kmap-fiddle include/linux/highmem.h
--- 25/include/linux/highmem.h~crashdump-routines-for-copying-dump-pages-kmap-fiddle	2004-11-10 20:06:02.598078600 -0800
+++ 25-akpm/include/linux/highmem.h	2004-11-10 20:06:34.061295464 -0800
@@ -30,7 +30,7 @@ static inline void *kmap(struct page *pa
 
 #define kmap_atomic(page, idx)	 ((char *)page_address(page))
 #define kunmap_atomic(addr, idx) do { char *p = addr; (void)p; } while (0)
-#define kmap_atomic_pfn(pfn, idx)	page_address(pfn_to_page(pfn))
+#define kmap_atomic_pfn(pfn, idx) ((char *)page_address(pfn_to_page(pfn)))
 #define kmap_atomic_to_page(ptr) virt_to_page(ptr)
 
 #endif /* CONFIG_HIGHMEM */
diff -puN include/asm-i386/highmem.h~crashdump-routines-for-copying-dump-pages-kmap-fiddle include/asm-i386/highmem.h
--- 25/include/asm-i386/highmem.h~crashdump-routines-for-copying-dump-pages-kmap-fiddle	2004-11-10 20:06:02.599078448 -0800
+++ 25-akpm/include/asm-i386/highmem.h	2004-11-10 20:06:54.922124136 -0800
@@ -61,7 +61,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);
-void *kmap_atomic_pfn(unsigned long pfn, enum km_type type);
+char *kmap_atomic_pfn(unsigned long pfn, enum km_type type);
 struct page *kmap_atomic_to_page(void *ptr);
 
 #define flush_cache_kmaps()	do { } while (0)
_