From 797132cfb82f731faef2f7b0d746027593eeca8c Mon Sep 17 00:00:00 2001
From: Thomas Schoebel-Theuer <tst@1und1.de>
Date: Mon, 2 Sep 2013 11:58:17 +0200
Subject: [PATCH] sio: adapt to newer kernels (kmap_atomic)

---
 kernel/mars_sio.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/kernel/mars_sio.c b/kernel/mars_sio.c
index 7f126113..075995f8 100644
--- a/kernel/mars_sio.c
+++ b/kernel/mars_sio.c
@@ -113,13 +113,14 @@ static void sio_ref_put(struct sio_output *output, struct mref_object *mref)
 
 static int transfer_none(int cmd,
 			 struct page *raw_page, unsigned raw_off,
-			 //struct page *loop_page, unsigned loop_off,
 			 void *loop_buf,
 			 int size)
 {
-#if 1
+#ifdef KM_USER0
 	void *raw_buf = kmap_atomic(raw_page, KM_USER0) + raw_off;
-	//void *loop_buf = kmap_atomic(loop_page, KM_USER1) + loop_off;
+#else
+	void *raw_buf = kmap_atomic(raw_page) + raw_off;
+#endif
 
 	if (unlikely(!raw_buf || !loop_buf)) {
 		MARS_ERR("transfer NULL: %p %p\n", raw_buf, loop_buf);
@@ -131,10 +132,12 @@ static int transfer_none(int cmd,
 	else
 		memcpy(raw_buf, loop_buf, size);
 
+#ifdef KM_USER0
 	kunmap_atomic(raw_buf, KM_USER0);
-	//kunmap_atomic(loop_buf, KM_USER1);
-	cond_resched();
+#else
+	kunmap_atomic(raw_buf);
 #endif
+	cond_resched();
 	return 0;
 }