korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-11 21:38:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

cpufeature: correctly annotate the module init function

Browse Source 
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: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Hendrik Brueckner 2015-02-19 14:44:24 +01:00 committed by Martin Schwidefsky
parent 9977e886cb
commit 7d0c502040
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/linux/cpufeature.h
View File

@ -11,6 +11,7 @@
#ifdef CONFIG_GENERIC_CPU_AUTOPROBE #ifdef CONFIG_GENERIC_CPU_AUTOPROBE
#include <linux/init.h>
#include <linux/mod_devicetable.h> #include <linux/mod_devicetable.h>
#include <asm/cpufeature.h> #include <asm/cpufeature.h>
@ -43,16 +44,16 @@
* For a list of legal values for 'feature', please consult the file * For a list of legal values for 'feature', please consult the file
* 'asm/cpufeature.h' of your favorite architecture. * '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[] = \ static struct cpu_feature const cpu_feature_match_ ## x[] = \
{ { .feature = cpu_feature(x) }, { } }; \ { { .feature = cpu_feature(x) }, { } }; \
MODULE_DEVICE_TABLE(cpu, cpu_feature_match_ ## 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))) \ if (!cpu_have_feature(cpu_feature(x))) \
return -ENODEV; \ return -ENODEV; \
return __init(); \ return __initfunc(); \
} \ } \
module_init(cpu_feature_match_ ## x ## _init) module_init(cpu_feature_match_ ## x ## _init)