module: Prepare for handling several RB trees
In order to separate text and data, we need to setup two rb trees. Modify functions to give the tree as a parameter. Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
This commit is contained in:
committed by
Luis Chamberlain
parent
80b8bf4369
commit
446d55666d
+10
-10
@@ -61,14 +61,14 @@ static const struct latch_tree_ops mod_tree_ops = {
|
||||
.comp = mod_tree_comp,
|
||||
};
|
||||
|
||||
static noinline void __mod_tree_insert(struct mod_tree_node *node)
|
||||
static noinline void __mod_tree_insert(struct mod_tree_node *node, struct mod_tree_root *tree)
|
||||
{
|
||||
latch_tree_insert(&node->node, &mod_tree.root, &mod_tree_ops);
|
||||
latch_tree_insert(&node->node, &tree->root, &mod_tree_ops);
|
||||
}
|
||||
|
||||
static void __mod_tree_remove(struct mod_tree_node *node)
|
||||
static void __mod_tree_remove(struct mod_tree_node *node, struct mod_tree_root *tree)
|
||||
{
|
||||
latch_tree_erase(&node->node, &mod_tree.root, &mod_tree_ops);
|
||||
latch_tree_erase(&node->node, &tree->root, &mod_tree_ops);
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -80,28 +80,28 @@ void mod_tree_insert(struct module *mod)
|
||||
mod->core_layout.mtn.mod = mod;
|
||||
mod->init_layout.mtn.mod = mod;
|
||||
|
||||
__mod_tree_insert(&mod->core_layout.mtn);
|
||||
__mod_tree_insert(&mod->core_layout.mtn, &mod_tree);
|
||||
if (mod->init_layout.size)
|
||||
__mod_tree_insert(&mod->init_layout.mtn);
|
||||
__mod_tree_insert(&mod->init_layout.mtn, &mod_tree);
|
||||
}
|
||||
|
||||
void mod_tree_remove_init(struct module *mod)
|
||||
{
|
||||
if (mod->init_layout.size)
|
||||
__mod_tree_remove(&mod->init_layout.mtn);
|
||||
__mod_tree_remove(&mod->init_layout.mtn, &mod_tree);
|
||||
}
|
||||
|
||||
void mod_tree_remove(struct module *mod)
|
||||
{
|
||||
__mod_tree_remove(&mod->core_layout.mtn);
|
||||
__mod_tree_remove(&mod->core_layout.mtn, &mod_tree);
|
||||
mod_tree_remove_init(mod);
|
||||
}
|
||||
|
||||
struct module *mod_find(unsigned long addr)
|
||||
struct module *mod_find(unsigned long addr, struct mod_tree_root *tree)
|
||||
{
|
||||
struct latch_tree_node *ltn;
|
||||
|
||||
ltn = latch_tree_find((void *)addr, &mod_tree.root, &mod_tree_ops);
|
||||
ltn = latch_tree_find((void *)addr, &tree->root, &mod_tree_ops);
|
||||
if (!ltn)
|
||||
return NULL;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user