From mboxrd@z Thu Jan 1 00:00:00 1970 From: david.goulet@polymtl.ca (David Goulet) Date: Sun, 15 Aug 2010 21:01:56 -0400 Subject: [ltt-dev] [PATCH] Lib urcu commit 453629a9317adef5b96c3d55e4dcd98db680997a moved container_of definition to urcu/compiler.h Since, multiple warnings about redefinition of container_of appears. Message-ID: <1281920517-23344-1-git-send-email-david.goulet@polymtl.ca> Removed macro definition from ust core header and kcompat. Now using lib urcu macro definition which is the same. Signed-off-by: David Goulet --- include/ust/core.h | 4 ---- include/ust/kcompat/simple.h | 12 ------------ 2 files changed, 0 insertions(+), 16 deletions(-) diff --git a/include/ust/core.h b/include/ust/core.h index 0172614..b538e81 100644 --- a/include/ust/core.h +++ b/include/ust/core.h @@ -141,8 +141,4 @@ static __inline__ int get_count_order(unsigned int count) return order; } -#define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) - #endif /* UST_CORE_H */ diff --git a/include/ust/kcompat/simple.h b/include/ust/kcompat/simple.h index 762d802..38a9be5 100644 --- a/include/ust/kcompat/simple.h +++ b/include/ust/kcompat/simple.h @@ -21,18 +21,6 @@ #ifndef KCOMPAT_SIMPLE_H #define KCOMPAT_SIMPLE_H -/** - * container_of - cast a member of a structure out to the containing structure - * @ptr: the pointer to the member. - * @type: the type of the container struct this is embedded in. - * @member: the name of the member within the struct. - * - */ -#define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) - - /* libkcompat: from rcupdate.h */ struct rcu_head { -- 1.7.0.4