aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/rbtree.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 09:28:04 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-05-18 09:28:04 -0700
commitc4fd308ed62f292518363ea9c6c2adb3c2d95f9d (patch)
treed6b4e36159e502a43a91ade86379703442204fc5 /include/linux/rbtree.h
parent96fbeb973a7e17594a429537201611ca0b395622 (diff)
parent1f9cc3cb6a27521edfe0a21abf97d2bb11c4d237 (diff)
downloadkernel_goldelico_gta04-c4fd308ed62f292518363ea9c6c2adb3c2d95f9d.zip
kernel_goldelico_gta04-c4fd308ed62f292518363ea9c6c2adb3c2d95f9d.tar.gz
kernel_goldelico_gta04-c4fd308ed62f292518363ea9c6c2adb3c2d95f9d.tar.bz2
Merge branch 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-pat-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, pat: Update the page flags for memtype atomically instead of using memtype_lock x86, pat: In rbt_memtype_check_insert(), update new->type only if valid x86, pat: Migrate to rbtree only backend for pat memtype management x86, pat: Preparatory changes in pat.c for bigger rbtree change rbtree: Add support for augmented rbtrees
Diffstat (limited to 'include/linux/rbtree.h')
-rw-r--r--include/linux/rbtree.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/rbtree.h b/include/linux/rbtree.h
index 5210a5c..fe1872e 100644
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
@@ -110,6 +110,7 @@ struct rb_node
struct rb_root
{
struct rb_node *rb_node;
+ void (*augment_cb)(struct rb_node *node);
};
@@ -129,7 +130,9 @@ static inline void rb_set_color(struct rb_node *rb, int color)
rb->rb_parent_color = (rb->rb_parent_color & ~1) | color;
}
-#define RB_ROOT (struct rb_root) { NULL, }
+#define RB_ROOT (struct rb_root) { NULL, NULL, }
+#define RB_AUGMENT_ROOT(x) (struct rb_root) { NULL, x}
+
#define rb_entry(ptr, type, member) container_of(ptr, type, member)
#define RB_EMPTY_ROOT(root) ((root)->rb_node == NULL)