0001-PATCH-Remove-duplicated-variable-definitions.patch 3.6 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104
  1. From 399f2c9a3acd5bd913e50a4dde52dee6527b297e Mon Sep 17 00:00:00 2001
  2. From: Kairui Song <kasong@redhat.com>
  3. Date: Wed, 29 Jan 2020 13:37:13 +0800
  4. Subject: [PATCH] Remove duplicated variable definitions
  5. When building on Fedora 32 (with GCC 10), following error is observed:
  6. /usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2010: multiple definition of
  7. `crash_reserved_mem_nr'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2010: first defined here
  8. /usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:2009: multiple definition of
  9. `crash_reserved_mem'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:2009: first defined here
  10. /usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1278: multiple definition of
  11. `parallel_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1278: first defined here
  12. /usr/bin/ld: erase_info.o:/tmp/makedumpfile/makedumpfile.h:1265: multiple definition of
  13. `splitting_info_t'; elf_info.o:/tmp/makedumpfile/makedumpfile.h:1265: first defined here
  14. ...
  15. collect2: error: ld returned 1 exit status
  16. make: *** [Makefile:97: makedumpfile] Error 1
  17. These variables are wrongly defined multiple times. So remove the
  18. duplicated definitions.
  19. Signed-off-by: Kairui Song <kasong@redhat.com>
  20. Signed-off-by: Kazuhito Hagio <k-hagio-ab@nec.com>
  21. Signed-off-by: Alexander Egorenkov <egorenar-dev@posteo.net>
  22. ---
  23. makedumpfile.c | 8 ++++----
  24. makedumpfile.h | 8 ++++----
  25. 2 files changed, 8 insertions(+), 8 deletions(-)
  26. diff --git a/makedumpfile.c b/makedumpfile.c
  27. index e290fbd..ae7336a 100644
  28. --- a/makedumpfile.c
  29. +++ b/makedumpfile.c
  30. @@ -10954,7 +10954,7 @@ check_param_for_reassembling_dumpfile(int argc, char *argv[])
  31. return FALSE;
  32. if ((info->splitting_info
  33. - = malloc(sizeof(splitting_info_t) * info->num_dumpfile))
  34. + = malloc(sizeof(struct splitting_info) * info->num_dumpfile))
  35. == NULL) {
  36. MSG("Can't allocate memory for splitting_info.\n");
  37. return FALSE;
  38. @@ -11042,7 +11042,7 @@ check_param_for_creating_dumpfile(int argc, char *argv[])
  39. return FALSE;
  40. }
  41. if ((info->splitting_info
  42. - = malloc(sizeof(splitting_info_t) * info->num_dumpfile))
  43. + = malloc(sizeof(struct splitting_info) * info->num_dumpfile))
  44. == NULL) {
  45. MSG("Can't allocate memory for splitting_info.\n");
  46. return FALSE;
  47. @@ -11077,13 +11077,13 @@ check_param_for_creating_dumpfile(int argc, char *argv[])
  48. if (info->num_threads) {
  49. if ((info->parallel_info =
  50. - malloc(sizeof(parallel_info_t) * info->num_threads))
  51. + malloc(sizeof(struct parallel_info) * info->num_threads))
  52. == NULL) {
  53. MSG("Can't allocate memory for parallel_info.\n");
  54. return FALSE;
  55. }
  56. - memset(info->parallel_info, 0, sizeof(parallel_info_t)
  57. + memset(info->parallel_info, 0, sizeof(struct parallel_info)
  58. * info->num_threads);
  59. }
  60. diff --git a/makedumpfile.h b/makedumpfile.h
  61. index 68d9691..7217407 100644
  62. --- a/makedumpfile.h
  63. +++ b/makedumpfile.h
  64. @@ -1262,7 +1262,7 @@ struct splitting_info {
  65. mdf_pfn_t end_pfn;
  66. off_t offset_eraseinfo;
  67. unsigned long size_eraseinfo;
  68. -} splitting_info_t;
  69. +};
  70. struct parallel_info {
  71. int fd_memory;
  72. @@ -1275,7 +1275,7 @@ struct parallel_info {
  73. #ifdef USELZO
  74. lzo_bytep wrkmem;
  75. #endif
  76. -} parallel_info_t;
  77. +};
  78. struct ppc64_vmemmap {
  79. unsigned long phys;
  80. @@ -2006,8 +2006,8 @@ struct memory_range {
  81. };
  82. #define CRASH_RESERVED_MEM_NR 8
  83. -struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR];
  84. -int crash_reserved_mem_nr;
  85. +extern struct memory_range crash_reserved_mem[CRASH_RESERVED_MEM_NR];
  86. +extern int crash_reserved_mem_nr;
  87. unsigned long read_vmcoreinfo_symbol(char *str_symbol);
  88. int readmem(int type_addr, unsigned long long addr, void *bufptr, size_t size);
  89. --
  90. 2.28.0