land b1_4_bgl on HEAD (20050404_1913)

[fs/lustre-release.git] / lnet / include / libcfs / kp30.h

diff --git a/lnet/include/libcfs/kp30.h b/lnet/include/libcfs/kp30.h
index cdd1bff..4c3f225 100644 (file)
--- a/lnet/include/libcfs/kp30.h
+++ b/lnet/include/libcfs/kp30.h
@@ -7,7 +7,13 @@
 #define PORTAL_DEBUG
 #include <libcfs/libcfs.h>
 
-#include <libcfs/arch/kp30.h>
+#if defined(__linux__)
+#include <libcfs/linux/kp30.h>
+#elif defined(__APPLE__)
+#include <libcfs/darwin/kp30.h>
+#else
+#error Unsupported operating system
+#endif
 
 #ifdef __KERNEL__
 
@@ -206,7 +212,7 @@ void portals_debug_dumplog(void);
 # define portals_debug_msg(subsys, mask, file, fn, line, stack, format, a...) \
     printf("%02x:%06x (@%lu %s:%s,l. %d %d %lu): " format,                    \
            (subsys), (mask), (long)time(0), file, fn, line,                   \
-           getpid() , stack, ## a);
+           getpid(), (unsigned long)stack, ## a);
 
 #undef CWARN
 #undef CERROR
@@ -256,7 +262,7 @@ struct portals_device_userstate
  * USER LEVEL STUFF BELOW
  */
 
-#define PORTAL_IOCTL_VERSION 0x00010007
+#define PORTAL_IOCTL_VERSION 0x00010008
 #define PING_SYNC       0
 #define PING_ASYNC      1
 
@@ -378,7 +384,7 @@ static inline int portal_ioctl_pack(struct portal_ioctl_data *data, char **pbuf,
 
 #else
 
-extern inline int portal_ioctl_getdata(char *buf, char *end, void *arg);
+extern int portal_ioctl_getdata(char *buf, char *end, void *arg);
 
 #endif
 
@@ -394,7 +400,7 @@ extern inline int portal_ioctl_getdata(char *buf, char *end, void *arg);
 #define IOC_PORTAL_NAL_CMD                 _IOWR('e', 35, IOCTL_PORTAL_TYPE)
 #define IOC_PORTAL_GET_NID                 _IOWR('e', 36, IOCTL_PORTAL_TYPE)
 #define IOC_PORTAL_FAIL_NID                _IOWR('e', 37, IOCTL_PORTAL_TYPE)
-
+#define IOC_PORTAL_LOOPBACK                _IOWR('e', 38, IOCTL_PORTAL_TYPE)
 #define IOC_PORTAL_LWT_CONTROL             _IOWR('e', 39, IOCTL_PORTAL_TYPE)
 #define IOC_PORTAL_LWT_SNAPSHOT            _IOWR('e', 40, IOCTL_PORTAL_TYPE)
 #define IOC_PORTAL_LWT_LOOKUP_STRING       _IOWR('e', 41, IOCTL_PORTAL_TYPE)