Commit 1d7764cf authored by Heiko Carstens's avatar Heiko Carstens
Browse files

s390/modules: Simplify module_finalize() slightly 



Preinitialize the return value, and break out the for loop in
module_finalize() in case of an error to get rid of an ifdef.

This makes it easier to add additional code, which may also depend
on config options.

Reviewed-by: default avatarSven Schnelle <svens@linux.ibm.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent c3d17464

arch/s390/kernel/module.c

+5 −7
Original line number Diff line number Diff line
@@ -495,9 +495,7 @@ int module_finalize(const Elf_Ehdr *hdr, 
	const Elf_Shdr *s;

	char *secstrings, *secname;

	void *aseg;

#ifdef CONFIG_FUNCTION_TRACER

	int ret;

#endif

	int rc = 0;



	if (IS_ENABLED(CONFIG_EXPOLINE) &&

	    !nospec_disable && me->arch.plt_size) {
@@ -529,12 +527,12 @@ int module_finalize(const Elf_Ehdr *hdr, 


#ifdef CONFIG_FUNCTION_TRACER

		if (!strcmp(FTRACE_CALLSITE_SECTION, secname)) {

			ret = module_alloc_ftrace_hotpatch_trampolines(me, s);

			if (ret < 0)

				return ret;

			rc = module_alloc_ftrace_hotpatch_trampolines(me, s);

			if (rc)

				break;

		}

#endif /* CONFIG_FUNCTION_TRACER */

	}



	return 0;

	return rc;

}