1*4882a593SmuzhiyunFrom 5e7ce27626a44428c01e0e5ab3fe60ef98ca788c Mon Sep 17 00:00:00 2001
2*4882a593SmuzhiyunFrom: Petr Tesarik <ptesarik@suse.cz>
3*4882a593SmuzhiyunDate: Mon, 26 Apr 2021 15:29:51 +0200
4*4882a593SmuzhiyunSubject: kexec-tools: Remove duplicate definition of ramdisk
5*4882a593Smuzhiyun
6*4882a593SmuzhiyunThe ramdisk variable is defined in kexec/arch/ppc/kexec-ppc.c. This
7*4882a593Smuzhiyunother definition is not needed and breaks build with -fno-common.
8*4882a593Smuzhiyun
9*4882a593SmuzhiyunSigned-off-by: Petr Tesarik <ptesarik@suse.com>
10*4882a593SmuzhiyunSigned-off-by: Simon Horman <horms@verge.net.au>
11*4882a593Smuzhiyun[Retrieved from:
12*4882a593Smuzhiyunhttps://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git/commit/?id=5e7ce27626a44428c01e0e5ab3fe60ef98ca788c]
13*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
14*4882a593Smuzhiyun---
15*4882a593Smuzhiyun kexec/arch/ppc/kexec-elf-ppc.c | 1 -
16*4882a593Smuzhiyun 1 file changed, 1 deletion(-)
17*4882a593Smuzhiyun
18*4882a593Smuzhiyundiff --git a/kexec/arch/ppc/kexec-elf-ppc.c b/kexec/arch/ppc/kexec-elf-ppc.c
19*4882a593Smuzhiyunindex ad43ad1..4a4886e 100644
20*4882a593Smuzhiyun--- a/kexec/arch/ppc/kexec-elf-ppc.c
21*4882a593Smuzhiyun+++ b/kexec/arch/ppc/kexec-elf-ppc.c
22*4882a593Smuzhiyun@@ -33,7 +33,6 @@
23*4882a593Smuzhiyun static const int probe_debug = 0;
24*4882a593Smuzhiyun
25*4882a593Smuzhiyun unsigned char reuse_initrd;
26*4882a593Smuzhiyun-const char *ramdisk;
27*4882a593Smuzhiyun int create_flatten_tree(struct kexec_info *, unsigned char **, unsigned long *,
28*4882a593Smuzhiyun 			char *);
29*4882a593Smuzhiyun
30*4882a593Smuzhiyun--
31*4882a593Smuzhiyuncgit 1.2.3-1.el7
32*4882a593Smuzhiyun
33