From d7ec87f2154e8e199378e4d364546df8819f6644 Mon Sep 17 00:00:00 2001
From: "Salyzyn, Mark" <Mark_Salyzyn@adaptec.com>
Date: Fri, 11 Jan 2008 11:46:44 -0800
Subject: [PATCH] --- yaml --- r: 77119 b: refs/heads/master c:
 3a0086a80ab7c2f1adb0e9b2a6fc82632979cec5 h: refs/heads/master i:   77117:
 854766f8e6cfae928ca032ef2e60b8f52ae53e10   77115:
 1d2da3167490c1d2feea0d47957994fd7944b8f6   77111:
 3b4ab9f5f7987048b7cff4b6cedfdb1f6de1032d   77103:
 5d65912836fd0bd8625d1b1d97d6eea70f40e881   77087:
 d9c6ab6d6bc5b3884151bef877000123f32f04e5   77055:
 428c70baab7802ded8ac2cf8e4571b9c373182a4 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/scsi/aacraid/aachba.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 96905259294e..b1c2f623db13 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 984621b4379cccbd0330e10622021a3cfe464ad5
+refs/heads/master: 3a0086a80ab7c2f1adb0e9b2a6fc82632979cec5
diff --git a/trunk/drivers/scsi/aacraid/aachba.c b/trunk/drivers/scsi/aacraid/aachba.c
index 3cddcc0901b2..970a8d99107a 100644
--- a/trunk/drivers/scsi/aacraid/aachba.c
+++ b/trunk/drivers/scsi/aacraid/aachba.c
@@ -31,9 +31,9 @@
 #include <linux/slab.h>
 #include <linux/completion.h>
 #include <linux/blkdev.h>
-#include <linux/dma-mapping.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
+#include <linux/highmem.h> /* For flush_kernel_dcache_page */
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -366,6 +366,7 @@ static void aac_internal_transfer(struct scsi_cmnd *scsicmd, void *data, unsigne
 	if (buf && transfer_len > 0)
 		memcpy(buf + offset, data, transfer_len);
 
+	flush_kernel_dcache_page(kmap_atomic_to_page(buf - sg->offset));
 	kunmap_atomic(buf - sg->offset, KM_IRQ0);
 
 }