summaryrefslogtreecommitdiffstats
path: root/kernel/include/linux/cpufeature.h
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/include/linux/cpufeature.h')
-rw-r--r--kernel/include/linux/cpufeature.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/include/linux/cpufeature.h b/kernel/include/linux/cpufeature.h
index c4d4eb8ac..986c06c88 100644
--- a/kernel/include/linux/cpufeature.h
+++ b/kernel/include/linux/cpufeature.h
@@ -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)