Commit 6fb0538d authored by Aaron Tomlin's avatar Aaron Tomlin Committed by Luis Chamberlain
Browse files

module: Move module_assert_mutex_or_preempt() to internal.h 



No functional change.

This patch migrates module_assert_mutex_or_preempt() to internal.h.
So, the aforementiond function can be used outside of main/or core
module code yet will remain restricted for internal use only.

Signed-off-by: default avatarAaron Tomlin <atomlin@redhat.com>
Signed-off-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
parent c14e522b

kernel/module/internal.h

+12 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#include <linux/module.h>

#include <linux/mutex.h>

#include <linux/rculist.h>

#include <linux/rcupdate.h>



#ifndef ARCH_SHF_SMALL

#define ARCH_SHF_SMALL 0
@@ -102,6 +103,17 @@ long module_get_offset(struct module *mod, unsigned int *size, Elf_Shdr *sechdr, 
char *module_flags(struct module *mod, char *buf);

size_t module_flags_taint(unsigned long taints, char *buf);



static inline void module_assert_mutex_or_preempt(void)

{

#ifdef CONFIG_LOCKDEP

	if (unlikely(!debug_locks))

		return;



	WARN_ON_ONCE(!rcu_read_lock_sched_held() &&

		     !lockdep_is_held(&module_mutex));

#endif

}



static inline unsigned long kernel_symbol_value(const struct kernel_symbol *sym)

{

#ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS

kernel/module/main.c

+0 −11
Original line number Diff line number Diff line
@@ -118,17 +118,6 @@ static void mod_update_bounds(struct module *mod) 
#endif

}



static void module_assert_mutex_or_preempt(void)

{

#ifdef CONFIG_LOCKDEP

	if (unlikely(!debug_locks))

		return;



	WARN_ON_ONCE(!rcu_read_lock_sched_held() &&

		!lockdep_is_held(&module_mutex));

#endif

}



/* Block module loading/unloading? */

int modules_disabled = 0;

core_param(nomodule, modules_disabled, bint, 0);