From 963de579a3681191be1ba7f61f6b16db2abb09e0 Mon Sep 17 00:00:00 2001
From: bwzhou <bwzhou>
Date: Fri, 21 Mar 2008 17:26:43 +0000
Subject: [PATCH] Branch HEAD b=14746 r=adilger, bwzhou

patch for _IOWR redefined build error on SLES10 environment (the LNET part)
---
 lnet/include/libcfs/linux/kp30.h | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lnet/include/libcfs/linux/kp30.h b/lnet/include/libcfs/linux/kp30.h
index e84a913..f2a1bfb 100644
--- a/lnet/include/libcfs/linux/kp30.h
+++ b/lnet/include/libcfs/linux/kp30.h
@@ -185,9 +185,7 @@ static inline void our_cond_resched(void)
 #else  /* !__KERNEL__ */
 # include <stdio.h>
 # include <stdlib.h>
-#ifdef CRAY_XT3
-# include <ioctl.h>
-#elif defined(__CYGWIN__)
+#if defined(__CYGWIN__)
 # include <cygwin-ioctl.h>
 #else
 # include <stdint.h>
@@ -197,6 +195,9 @@ static inline void our_cond_resched(void)
 # include <limits.h>
 # include <errno.h>
 # include <sys/ioctl.h>                         /* for _IOWR */
+#ifndef _IOWR
+#include "ioctl.h"
+#endif
 
 # define CFS_MODULE_PARM(name, t, type, perm, desc)
 #define PORTAL_SYMBOL_GET(x) inter_module_get(#x)
-- 
1.8.3.1