Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d435f9d authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: add is_module_address() 



Add is_module_address() method - to be used by lockdep.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 93e02814

include/linux/module.h

+6 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ static inline int module_is_live(struct module *mod) 
/* Is this address in a module? (second is with no locks, for oops) */

struct module *module_text_address(unsigned long addr);

struct module *__module_text_address(unsigned long addr);

int is_module_address(unsigned long addr);



/* Returns module and fills in value, defined and namebuf, or NULL if

   symnum out of range. */
@@ -496,6 +497,11 @@ static inline struct module *__module_text_address(unsigned long addr) 
	return NULL;

}



static inline int is_module_address(unsigned long addr)

{

	return 0;

}



/* Get/put a kernel symbol (calls should be symmetric) */

#define symbol_get(x) ({ extern typeof(x) x __attribute__((weak)); &(x); })

#define symbol_put(x) do { } while(0)

kernel/module.c

+23 −0
Original line number Diff line number Diff line
@@ -2159,6 +2159,29 @@ const struct exception_table_entry *search_module_extables(unsigned long addr) 
	return e;

}



/*

 * Is this a valid module address?

 */

int is_module_address(unsigned long addr)

{

	unsigned long flags;

	struct module *mod;



	spin_lock_irqsave(&modlist_lock, flags);



	list_for_each_entry(mod, &modules, list) {

		if (within(addr, mod->module_core, mod->core_size)) {

			spin_unlock_irqrestore(&modlist_lock, flags);

			return 1;

		}

	}



	spin_unlock_irqrestore(&modlist_lock, flags);



	return 0;

}





/* Is this a valid kernel address?  We don't grab the lock: we are oopsing. */

struct module *__module_text_address(unsigned long addr)

{