Commit 80b8bf43 authored by Christophe Leroy's avatar Christophe Leroy Committed by Luis Chamberlain
Browse files

module: Always have struct mod_tree_root 



In order to separate text and data, we need to setup
two rb trees.

This means that struct mod_tree_root is required even without
MODULES_TREE_LOOKUP.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: default avatarAaron Tomlin <atomlin@atomlin.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent 7337f929

kernel/module/internal.h

+3 −1
Original line number Diff line number Diff line
@@ -143,15 +143,17 @@ static inline void module_decompress_cleanup(struct load_info *info) 
}

#endif



#ifdef CONFIG_MODULES_TREE_LOOKUP

struct mod_tree_root {

#ifdef CONFIG_MODULES_TREE_LOOKUP

	struct latch_tree_root root;

#endif

	unsigned long addr_min;

	unsigned long addr_max;

};



extern struct mod_tree_root mod_tree;



#ifdef CONFIG_MODULES_TREE_LOOKUP

void mod_tree_insert(struct module *mod);

void mod_tree_remove_init(struct module *mod);

void mod_tree_remove(struct module *mod);

kernel/module/main.c

+0 −5
Original line number Diff line number Diff line
@@ -74,7 +74,6 @@ static void do_free_init(struct work_struct *w); 
static DECLARE_WORK(init_free_wq, do_free_init);

static LLIST_HEAD(init_free_list);



#ifdef CONFIG_MODULES_TREE_LOOKUP

struct mod_tree_root mod_tree __cacheline_aligned = {

	.addr_min = -1UL,

};
@@ -82,10 +81,6 @@ struct mod_tree_root mod_tree __cacheline_aligned = { 
#define module_addr_min mod_tree.addr_min

#define module_addr_max mod_tree.addr_max



#else /* !CONFIG_MODULES_TREE_LOOKUP */

static unsigned long module_addr_min = -1UL, module_addr_max;

#endif /* CONFIG_MODULES_TREE_LOOKUP */



struct symsearch {

	const struct kernel_symbol *start, *stop;

	const s32 *crcs;