From 9586e4964ac82276b04b12f53dd1769d9bbe4f7c Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Fri, 21 Sep 2012 17:17:45 -0700 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index c009dc43..22307ee7 100644 --- a/meta +++ b/meta @@ -1,8 +1,9 @@ Version: 1 -Previous: d052de7c4c340f707021a18971635e1847b6e329 -Head: a88a9c74ad1e610f1ea24aabe5f1a238b3ad67e2 +Previous: 60b9f7dad00e83711ce76c93b47485c79678924b +Head: 57d091eabde4a61ff91fdb58938ecd2e9ce5991c Applied: cont_of: a88a9c74ad1e610f1ea24aabe5f1a238b3ad67e2 + refresh-temp: 57d091eabde4a61ff91fdb58938ecd2e9ce5991c Unapplied: af-ib-conn: 027cb3c0a4fe70b9a9a65896b5f2e53683328db8 addrtype: 066c2615bf5399848088a9771093a76c5e205bf1 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..2a05e027 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,24 @@ +Bottom: fd25e5104198197967ac10d49db6570c49bf661c +Top: 2d834bd45b50141247cec98ef6807b7374d7cf2e +Author: Sean Hefty +Date: 2012-09-21 17:17:45 -0700 + +Refresh of cont_of + +--- + +diff --git a/src/cma.c b/src/cma.c +index d168df6..91bf108 100755 +--- a/src/cma.c ++++ b/src/cma.c +@@ -124,8 +124,10 @@ static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER; + static int abi_ver = RDMA_USER_CM_MAX_ABI_VERSION; + int af_ib_support; + ++#ifndef container_of + #define container_of(ptr, type, field) \ + ((type *) ((void *)ptr - offsetof(type, field))) ++#endif + + static void ucma_cleanup(void) + { -- 2.46.0