diff options
| author | Jan Beulich <JBeulich@novell.com> | 2009-08-19 08:40:48 +0100 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-08-21 15:30:12 -0700 |
| commit | 8b5a10fc6fd02289ea03480f93382b1a99006142 (patch) | |
| tree | 894760a2b83fd96d0e1cc2a4f907b350e602c39f /include/linux/init.h | |
| parent | c7425314c755d5f94da7c978205c85a7c6201212 (diff) | |
| download | talos-op-linux-8b5a10fc6fd02289ea03480f93382b1a99006142.tar.gz talos-op-linux-8b5a10fc6fd02289ea03480f93382b1a99006142.zip | |
x86: properly annotate alternatives.c
Some of the NOPs tables aren't used on 64-bits, quite some code and
data is needed post-init for module loading only, and a couple of
functions aren't used outside that file (i.e. can be static, and don't
need to be exported).
The change to __INITDATA/__INITRODATA is needed to avoid an assembler
warning.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
LKML-Reference: <4A8BC8A00200007800010823@vpn.id2.novell.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'include/linux/init.h')
| -rw-r--r-- | include/linux/init.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/include/linux/init.h b/include/linux/init.h index 13b633ed695e..400adbb45414 100644 --- a/include/linux/init.h +++ b/include/linux/init.h @@ -103,8 +103,8 @@ #define __INIT .section ".init.text","ax" #define __FINIT .previous -#define __INITDATA .section ".init.data","aw" -#define __INITRODATA .section ".init.rodata","a" +#define __INITDATA .section ".init.data","aw",%progbits +#define __INITRODATA .section ".init.rodata","a",%progbits #define __FINITDATA .previous #define __DEVINIT .section ".devinit.text", "ax" @@ -305,9 +305,17 @@ void __init parse_early_options(char *cmdline); #ifdef CONFIG_MODULES #define __init_or_module #define __initdata_or_module +#define __initconst_or_module +#define __INIT_OR_MODULE .text +#define __INITDATA_OR_MODULE .data +#define __INITRODATA_OR_MODULE .section ".rodata","a",%progbits #else #define __init_or_module __init #define __initdata_or_module __initdata +#define __initconst_or_module __initconst +#define __INIT_OR_MODULE __INIT +#define __INITDATA_OR_MODULE __INITDATA +#define __INITRODATA_OR_MODULE __INITRODATA #endif /*CONFIG_MODULES*/ /* Functions marked as __devexit may be discarded at kernel link time, depending |
