diff options
author | Vivek Goyal <vgoyal@redhat.com> | 2014-10-13 18:53:46 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-13 20:18:21 -0400 |
commit | f8da964dfbdca0eb14f9bf67be4ab6d256f90b7f (patch) | |
tree | 024cef5bda9025cbba907accb2155e0b7d7e848a /arch | |
parent | 36f3f500efe6a19b7ce1e1205c105a2cbb2124d9 (diff) |
kexec-bzimage64: fix sparse warnings
David Howells brought to my attention the mails generated by kbuild test
bot and following sparse warnings were present. This patch fixes these
warnings.
arch/x86/kernel/kexec-bzimage64.c:270:5: warning: symbol 'bzImage64_probe' was not declared. Should it be static?
arch/x86/kernel/kexec-bzimage64.c:328:6: warning: symbol 'bzImage64_load' was not declared. Should it be static?
arch/x86/kernel/kexec-bzimage64.c:517:5: warning: symbol 'bzImage64_cleanup' was not declared. Should it be static?
arch/x86/kernel/kexec-bzimage64.c:531:5: warning: symbol 'bzImage64_verify_sig' was not declared. Should it be static?
arch/x86/kernel/kexec-bzimage64.c:546:23: warning: symbol 'kexec_bzImage64_ops' was not declared. Should it be static?
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Reported-by: David Howells <dhowells@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/kexec-bzimage64.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/x86/kernel/kexec-bzimage64.c b/arch/x86/kernel/kexec-bzimage64.c index 9642b9b33655..ca05f86481aa 100644 --- a/arch/x86/kernel/kexec-bzimage64.c +++ b/arch/x86/kernel/kexec-bzimage64.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <asm/setup.h> | 26 | #include <asm/setup.h> |
27 | #include <asm/crash.h> | 27 | #include <asm/crash.h> |
28 | #include <asm/efi.h> | 28 | #include <asm/efi.h> |
29 | #include <asm/kexec-bzimage64.h> | ||
29 | 30 | ||
30 | #define MAX_ELFCOREHDR_STR_LEN 30 /* elfcorehdr=0x<64bit-value> */ | 31 | #define MAX_ELFCOREHDR_STR_LEN 30 /* elfcorehdr=0x<64bit-value> */ |
31 | 32 | ||
@@ -267,7 +268,7 @@ setup_boot_parameters(struct kimage *image, struct boot_params *params, | |||
267 | return ret; | 268 | return ret; |
268 | } | 269 | } |
269 | 270 | ||
270 | int bzImage64_probe(const char *buf, unsigned long len) | 271 | static int bzImage64_probe(const char *buf, unsigned long len) |
271 | { | 272 | { |
272 | int ret = -ENOEXEC; | 273 | int ret = -ENOEXEC; |
273 | struct setup_header *header; | 274 | struct setup_header *header; |
@@ -325,10 +326,10 @@ int bzImage64_probe(const char *buf, unsigned long len) | |||
325 | return ret; | 326 | return ret; |
326 | } | 327 | } |
327 | 328 | ||
328 | void *bzImage64_load(struct kimage *image, char *kernel, | 329 | static void *bzImage64_load(struct kimage *image, char *kernel, |
329 | unsigned long kernel_len, char *initrd, | 330 | unsigned long kernel_len, char *initrd, |
330 | unsigned long initrd_len, char *cmdline, | 331 | unsigned long initrd_len, char *cmdline, |
331 | unsigned long cmdline_len) | 332 | unsigned long cmdline_len) |
332 | { | 333 | { |
333 | 334 | ||
334 | struct setup_header *header; | 335 | struct setup_header *header; |
@@ -514,7 +515,7 @@ out_free_params: | |||
514 | } | 515 | } |
515 | 516 | ||
516 | /* This cleanup function is called after various segments have been loaded */ | 517 | /* This cleanup function is called after various segments have been loaded */ |
517 | int bzImage64_cleanup(void *loader_data) | 518 | static int bzImage64_cleanup(void *loader_data) |
518 | { | 519 | { |
519 | struct bzimage64_data *ldata = loader_data; | 520 | struct bzimage64_data *ldata = loader_data; |
520 | 521 | ||
@@ -528,7 +529,7 @@ int bzImage64_cleanup(void *loader_data) | |||
528 | } | 529 | } |
529 | 530 | ||
530 | #ifdef CONFIG_KEXEC_BZIMAGE_VERIFY_SIG | 531 | #ifdef CONFIG_KEXEC_BZIMAGE_VERIFY_SIG |
531 | int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len) | 532 | static int bzImage64_verify_sig(const char *kernel, unsigned long kernel_len) |
532 | { | 533 | { |
533 | bool trusted; | 534 | bool trusted; |
534 | int ret; | 535 | int ret; |