diff options
author | Helight.Xu <helight.xu@gmail.com> | 2009-11-30 05:33:51 -0500 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2009-11-30 14:16:49 -0500 |
commit | 9eaa192d8988d621217a9e6071cd403fd6010496 (patch) | |
tree | cd7cc0a27b5a063270a431053fb871ced84b0cba /arch/x86/kernel/setup.c | |
parent | 6dbfe5a57db3564adf7b2a65068e40f1b4a0d2db (diff) |
x86: Fix a section mismatch in arch/x86/kernel/setup.c
copy_edd() should be __init.
warning msg:
WARNING: vmlinux.o(.text+0x7759): Section mismatch in reference from the
function copy_edd() to the variable .init.data:boot_params
The function copy_edd() references
the variable __initdata boot_params.
This is often because copy_edd lacks a __initdata
annotation or the annotation of boot_params is wrong.
Signed-off-by: ZhenwenXu <helight.xu@gmail.com>
LKML-Reference: <4B139F8F.4000907@gmail.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/kernel/setup.c')
-rw-r--r-- | arch/x86/kernel/setup.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index e09f0e2c14b5..e020b2d03b4f 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -247,7 +247,7 @@ EXPORT_SYMBOL(edd); | |||
247 | * from boot_params into a safe place. | 247 | * from boot_params into a safe place. |
248 | * | 248 | * |
249 | */ | 249 | */ |
250 | static inline void copy_edd(void) | 250 | static inline void __init copy_edd(void) |
251 | { | 251 | { |
252 | memcpy(edd.mbr_signature, boot_params.edd_mbr_sig_buffer, | 252 | memcpy(edd.mbr_signature, boot_params.edd_mbr_sig_buffer, |
253 | sizeof(edd.mbr_signature)); | 253 | sizeof(edd.mbr_signature)); |
@@ -256,7 +256,7 @@ static inline void copy_edd(void) | |||
256 | edd.edd_info_nr = boot_params.eddbuf_entries; | 256 | edd.edd_info_nr = boot_params.eddbuf_entries; |
257 | } | 257 | } |
258 | #else | 258 | #else |
259 | static inline void copy_edd(void) | 259 | static inline void __init copy_edd(void) |
260 | { | 260 | { |
261 | } | 261 | } |
262 | #endif | 262 | #endif |