From c9e28d512b1ba159548bc040920d70d3e41fad13 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Wed, 12 Jan 2005 19:46:31 +0000
Subject: [PATCH] Branch: b1_4_smallfix Two compile fixes for recent obdfilter
 changes. Compile warning fixups for 2.6/x86_64. b=5545

---
 lnet/klnds/socklnd/socklnd.h    | 2 +-
 lnet/klnds/socklnd/socklnd_cb.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lnet/klnds/socklnd/socklnd.h b/lnet/klnds/socklnd/socklnd.h
index 7f08029..f1f3de0 100644
--- a/lnet/klnds/socklnd/socklnd.h
+++ b/lnet/klnds/socklnd/socklnd.h
@@ -113,7 +113,7 @@
 #else
 # define SOCKNAL_RISK_KMAP_DEADLOCK  1
 #endif
-                                                
+
 #if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,72))
 # define sk_allocation  allocation
 # define sk_data_ready	data_ready
diff --git a/lnet/klnds/socklnd/socklnd_cb.c b/lnet/klnds/socklnd/socklnd_cb.c
index ed91f94..3dcaa6c 100644
--- a/lnet/klnds/socklnd/socklnd_cb.c
+++ b/lnet/klnds/socklnd/socklnd_cb.c
@@ -213,7 +213,9 @@ ksocknal_send_kiov (ksock_conn_t *conn, ksock_tx_t *tx)
                 struct iovec *scratchiov = &scratch;
                 int           niov = 1;
 #else
+#ifdef CONFIG_HIGHMEM
 #warning "XXX risk of kmap deadlock on multiple frags..."
+#endif
                 struct iovec *scratchiov = conn->ksnc_tx_scratch_iov;
                 int           niov = tx->tx_nkiov;
 #endif
@@ -456,10 +458,12 @@ ksocknal_recv_kiov (ksock_conn_t *conn)
         struct iovec *scratchiov = &scratch;
         int           niov = 1;
 #else
+#ifdef CONFIG_HIGHMEM
 #warning "XXX risk of kmap deadlock on multiple frags..."
+#endif
         struct iovec *scratchiov = conn->ksnc_rx_scratch_iov;
         int           niov = conn->ksnc_rx_nkiov;
-#endif   
+#endif
         ptl_kiov_t   *kiov = conn->ksnc_rx_kiov;
         struct msghdr msg = {
                 .msg_name       = NULL,
-- 
1.8.3.1