X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Frbtree.h;h=4b7cc4fe366d2bc2a028b757edca43b9523ac6a4;hb=6a77f38946aaee1cd85eeec6cf4229b204c15071;hp=3ae0c6e140aff8dde3bd40c6bb51df92300b0f63;hpb=87fc8d1bb10cd459024a742c6a10961fefcef18f;p=linux-2.6.git

diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index 3ae0c6e14..4b7cc4fe3 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -113,8 +113,7 @@ struct rb_root
 };
 
 #define RB_ROOT	(struct rb_root) { NULL, }
-#define	rb_entry(ptr, type, member)					\
-	((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member)))
+#define	rb_entry(ptr, type, member) container_of(ptr, type, member)
 
 extern void rb_insert_color(struct rb_node *, struct rb_root *);
 extern void rb_erase(struct rb_node *, struct rb_root *);