ib_acm: move zalloc to osd header file for common use

Signed-off-by: Sean Hefty <sean.hefty@intel.com>

diff --git a/include/infiniband/ib_acm.h b/include/infiniband/ib_acm.h
index 5c0b7dced2b521c2e142903e2f67cae28ffc6247..6618e845bb0507b83ab3e6338943b14d559d1b77 100644 (file)
--- a/include/infiniband/ib_acm.h
+++ b/include/infiniband/ib_acm.h
@@ -54,7 +54,7 @@ struct ib_acm_resolve_data
 {\r
        uint32_t reserved1;\r
        uint8_t  init_depth;\r
-       uint8_t  resp_resources;\r
+       uint8_t  resp_resources;\r
        uint8_t  packet_lifetime;\r
        uint8_t  mtu;\r
        uint8_t  reserved2[8];\r

diff --git a/linux/osd.h b/linux/osd.h
index 20a11b8ab9436a9642e924bca79afe5152d2899a..c4e018feea7261e7e0b6a05285d20d57699f77dc 100644 (file)
--- a/linux/osd.h
+++ b/linux/osd.h
@@ -60,6 +60,15 @@
 #endif\r
 #define ntohll(x) htonll(x)\r
 \r
+static inline void *zalloc(size_t size)\r
+{\r
+       void *buf;\r
+\r
+       if ((buf = malloc(size)))\r
+               memset(buf, 0, size);\r
+       return buf;\r
+}\r
+\r
 typedef struct { volatile int val; } atomic_t;\r
 #define atomic_inc(v) (__sync_fetch_and_add(&(v)->val, 1) + 1)\r
 #define atomic_dec(v) (__sync_fetch_and_sub(&(v)->val, 1) - 1)\r

diff --git a/src/acm.c b/src/acm.c
index e09ecd7dfe28ea8128a84c945ee36191c89592d1..f4e086e32f590bc34fb0e1baeee426d8cfd5fccb 100644 (file)
--- a/src/acm.c
+++ b/src/acm.c
@@ -211,16 +211,6 @@ static void acm_log_ep_addr(int level, const char *msg,
        lock_release(&log_lock);\r
 }\r
 \r
-static void *zalloc(size_t size)\r
-{\r
-       void *buf;\r
-\r
-       buf = malloc(size);\r
-       if (buf)\r
-               memset(buf, 0, size);\r
-       return buf;\r
-}\r
-\r
 static struct acm_send_msg *\r
 acm_alloc_send(struct acm_ep *ep, struct acm_dest *dest, size_t size)\r
 {\r

diff --git a/windows/osd.h b/windows/osd.h
index aab6bf79be117193848cb5499aa0ea427a0f24a8..dd90da4f7e57e9da8786ab7bd27a243f14ad82e6 100644 (file)
--- a/windows/osd.h
+++ b/windows/osd.h
@@ -27,17 +27,27 @@
  * SOFTWARE.\r
  */\r
 \r
-#if !defined(MC_CM_OSD_H)\r
-#define MC_CM_OSD_H\r
+#if !defined(OSD_H)\r
+#define OSD_H\r
 \r
 #include <windows.h>\r
 #include <process.h>\r
+#include <malloc.h>\r
 #include <winsock2.h>\r
 \r
 #define __func__ __FUNCTION__\r
 #define LIB_DESTRUCTOR\r
 #define CDECL_FUNC __cdecl\r
 \r
+static __inline void *zalloc(size_t size)\r
+{\r
+       void *buf;\r
+\r
+       if ((buf = malloc(size)))\r
+               memset(buf, 0, size);\r
+       return buf;\r
+}\r
+\r
 typedef struct { volatile LONG val; } atomic_t;\r
 #define atomic_inc(v) InterlockedIncrement(&(v)->val)\r
 #define atomic_dec(v) InterlockedDecrement(&(v)->val)\r
@@ -85,4 +95,4 @@ static __inline UINT64 time_stamp_us(void)
 #define beginthread(func, arg) (int) _beginthread(func, 0, arg)\r
 #define container_of CONTAINING_RECORD\r
 \r
-#endif /* MC_CM_OSD_H */\r
+#endif /* OSD_H */\r