--- 2.4.10pre2aa1/include/asm-i386/kmap_types.h.~1~	Tue Aug 28 22:19:40 2001
+++ 2.4.10pre2aa1/include/asm-i386/kmap_types.h	Thu Aug 30 04:14:54 2001
@@ -3,7 +3,6 @@
 
 enum km_type {
 	KM_BOUNCE_READ,
-	KM_BOUNCE_WRITE,
 	KM_SKB_DATA,
 	KM_SKB_DATA_SOFTIRQ,
 	KM_USER0,
--- 2.4.10pre2aa1/include/asm-ppc/kmap_types.h.~1~	Sat May 26 04:03:48 2001
+++ 2.4.10pre2aa1/include/asm-ppc/kmap_types.h	Thu Aug 30 04:15:23 2001
@@ -7,9 +7,10 @@
 
 enum km_type {
 	KM_BOUNCE_READ,
-	KM_BOUNCE_WRITE,
 	KM_SKB_DATA,
 	KM_SKB_DATA_SOFTIRQ,
+	KM_USER0,
+	KM_USER1,
 	KM_TYPE_NR
 };
 
--- 2.4.10pre2aa1/include/asm-sparc/kmap_types.h.~1~	Tue May  1 19:35:32 2001
+++ 2.4.10pre2aa1/include/asm-sparc/kmap_types.h	Thu Aug 30 04:15:30 2001
@@ -3,9 +3,10 @@
 
 enum km_type {
 	KM_BOUNCE_READ,
-	KM_BOUNCE_WRITE,
 	KM_SKB_DATA,
 	KM_SKB_DATA_SOFTIRQ,
+	KM_USER0,
+	KM_USER1,
 	KM_TYPE_NR
 };
 
--- 2.4.10pre2aa1/mm/highmem.c.~1~	Tue Aug 28 22:19:41 2001
+++ 2.4.10pre2aa1/mm/highmem.c	Thu Aug 30 04:15:46 2001
@@ -212,9 +212,9 @@
 
 	p_from = from->b_page;
 
-	vfrom = kmap_atomic(p_from, KM_BOUNCE_WRITE);
+	vfrom = kmap_atomic(p_from, KM_USER0);
 	memcpy(to->b_data, vfrom + bh_offset(from), to->b_size);
-	kunmap_atomic(vfrom, KM_BOUNCE_WRITE);
+	kunmap_atomic(vfrom, KM_USER0);
 }
 
 static inline void copy_to_high_bh_irq (struct buffer_head *to,