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

Commit 7d0c5020 authored by Hendrik Brueckner's avatar Hendrik Brueckner Committed by Martin Schwidefsky
Browse files

cpufeature: correctly annotate the module init function 



A section mismatch warning is reported if an __init annotated function is
specified for module_cpu_feature_match().
Change the module_cpu_feature_match() function and annotate the generated
cpu_feature_match_* function as __init.

Signed-off-by: default avatarHendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 9977e886

include/linux/cpufeature.h

+4 −3
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 


#ifdef CONFIG_GENERIC_CPU_AUTOPROBE



#include <linux/init.h>

#include <linux/mod_devicetable.h>

#include <asm/cpufeature.h>
@@ -43,16 +44,16 @@ 
 * For a list of legal values for 'feature', please consult the file

 * 'asm/cpufeature.h' of your favorite architecture.

 */

#define module_cpu_feature_match(x, __init)			\

#define module_cpu_feature_match(x, __initfunc)			\

static struct cpu_feature const cpu_feature_match_ ## x[] =	\

	{ { .feature = cpu_feature(x) }, { } };			\

MODULE_DEVICE_TABLE(cpu, cpu_feature_match_ ## x);		\

								\

static int cpu_feature_match_ ## x ## _init(void)		\

static int __init cpu_feature_match_ ## x ## _init(void)	\

{								\

	if (!cpu_have_feature(cpu_feature(x)))			\

		return -ENODEV;					\

	return __init();					\

	return __initfunc();					\

}								\

module_init(cpu_feature_match_ ## x ## _init)