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

Commit 53999bf3 authored by Kevin Winchester's avatar Kevin Winchester Committed by Linus Torvalds
Browse files

error: implicit declaration of function 'module_flags_taint' 



Recent changes to kernel/module.c caused the following compile
error:

  kernel/module.c: In function ‘show_taint’:
  kernel/module.c:1024:2: error: implicit declaration of function ‘module_flags_taint’ [-Werror=implicit-function-declaration]
  cc1: some warnings being treated as errors

Correct this error by moving the definition of module_flags_taint
outside of the #ifdef CONFIG_MODULE_UNLOAD section.

Signed-off-by: default avatarKevin Winchester <kjwinchester@gmail.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 122804ec

kernel/module.c

+20 −20
Original line number Diff line number Diff line
@@ -842,26 +842,6 @@ SYSCALL_DEFINE2(delete_module, const char __user *, name_user, 
	return ret;

}



static size_t module_flags_taint(struct module *mod, char *buf)

{

	size_t l = 0;



	if (mod->taints & (1 << TAINT_PROPRIETARY_MODULE))

		buf[l++] = 'P';

	if (mod->taints & (1 << TAINT_OOT_MODULE))

		buf[l++] = 'O';

	if (mod->taints & (1 << TAINT_FORCED_MODULE))

		buf[l++] = 'F';

	if (mod->taints & (1 << TAINT_CRAP))

		buf[l++] = 'C';

	/*

	 * TAINT_FORCED_RMMOD: could be added.

	 * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't

	 * apply to modules.

	 */

	return l;

}



static inline void print_unload_info(struct seq_file *m, struct module *mod)

{

	struct module_use *use;
@@ -962,6 +942,26 @@ static inline int module_unload_init(struct module *mod) 
}

#endif /* CONFIG_MODULE_UNLOAD */



static size_t module_flags_taint(struct module *mod, char *buf)

{

	size_t l = 0;



	if (mod->taints & (1 << TAINT_PROPRIETARY_MODULE))

		buf[l++] = 'P';

	if (mod->taints & (1 << TAINT_OOT_MODULE))

		buf[l++] = 'O';

	if (mod->taints & (1 << TAINT_FORCED_MODULE))

		buf[l++] = 'F';

	if (mod->taints & (1 << TAINT_CRAP))

		buf[l++] = 'C';

	/*

	 * TAINT_FORCED_RMMOD: could be added.

	 * TAINT_UNSAFE_SMP, TAINT_MACHINE_CHECK, TAINT_BAD_PAGE don't

	 * apply to modules.

	 */

	return l;

}



static ssize_t show_initstate(struct module_attribute *mattr,

			      struct module_kobject *mk, char *buffer)

{