# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.635   -> 1.636  
#	include/linux/ide24.h	1.1     -> 1.2    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/07/09	axboe@burns.home.kernel.dk	1.636
# Oops, fix the highmem rq/bio mapping placeholders so that they actually
# do something on 2.5
# --------------------------------------------
#
diff -Nru a/include/linux/ide24.h b/include/linux/ide24.h
--- a/include/linux/ide24.h	Tue Jul  9 15:51:08 2002
+++ b/include/linux/ide24.h	Tue Jul  9 15:51:08 2002
@@ -573,12 +573,16 @@
 
 extern inline void *ide_map_buffer(struct request *rq, unsigned long *flags)
 {
-	return rq->buffer + ide_rq_offset(rq);
+	if (rq->bio)
+		return bio_kmap_irq(rq->bio, flags) + ide_rq_offset(rq);
+	else
+		return rq->buffer + ide_rq_offset(rq);
 }
 
 extern inline void ide_unmap_buffer(char *buffer, unsigned long *flags)
 {
-	do { } while (0);
+	if (rq->bio)
+		bio_kunmap_irq(to, flags);
 }
 
 /*