Skip to contentSkip to conversation

ia64: Miscellaneous fixes and cleanups

PATCH Applied Geert Uytterhoeven 2 participants 7 messages Aug 25, 2021 – Sep 6, 2021

lore
Share & tools
lore
#0 lore raw

cover ia64: Miscellaneous fixes and cleanups

Hi Andrew,

This patch series contains some miscellaneous fixes and cleanups for ia64. The second patch fixes a naming conflict triggered by a patch for the FDT code.

This has been compile-tested only, due to lack of hardware.

Thanks!

Geert Uytterhoeven (3):
ia64: Fix #endif comment for reserve_elfcorehdr()
ia64: Make reserve_elfcorehdr() static
ia64: Make num_rsvd_regions static

 arch/ia64/include/asm/meminit.h |  2 --
 arch/ia64/kernel/setup.c        | 53 ++++++++++++++++-----------------
 2 files changed, 26 insertions(+), 29 deletions(-)
Signature · 12 lines
2.25.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds
#1 lore raw

PATCH 1/3 ia64: Fix #endif comment for reserve_elfcorehdr()

The definition of reserve_elfcorehdr() depends on CONFIG_CRASH_DUMP, not CONFIG_PROC_VMCORE.

Fixes d9a9855d0b06ca6d ("always reserve elfcore header memory in crash kernel")
Fixes 17c1f07ed70afa4f ("[IA64] Reserve elfcorehdr memory in CONFIG_CRASH_DUMP")
---
 arch/ia64/kernel/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/ia64/kernel/setup.c +1 -1
index dd595fbd800651fe..fbd931f1eb270d98 100644
@@ -546,7 +546,7 @@ int __init reserve_elfcorehdr(u64 *start, u64 *end)
 	return 0;
 }
 
-#endif /* CONFIG_PROC_VMCORE */
+#endif /* CONFIG_CRASH_DUMP */
 
 void __init
 setup_arch (char **cmdline_p)
Signature · 1 line
2.25.1
Reviewed-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] ia64: Fix #endif comment for reserve_elfcorehdr()

Quoted 6 lines · Geert Uytterhoeven

The definition of reserve_elfcorehdr() depends on CONFIG_CRASH_DUMP, not CONFIG_PROC_VMCORE.

Fixes d9a9855d0b06ca6d ("always reserve elfcore header memory in crash kernel")
Fixes 17c1f07ed70afa4f ("[IA64] Reserve elfcorehdr memory in CONFIG_CRASH_DUMP")
Quoted 20 lines
---
 arch/ia64/kernel/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/ia64/kernel/setup.c +1 -1
index dd595fbd800651fe..fbd931f1eb270d98 100644
@@ -546,7 +546,7 @@ int __init reserve_elfcorehdr(u64 *start, u64 *end)
 	return 0;
 }
 
-#endif /* CONFIG_PROC_VMCORE */
+#endif /* CONFIG_CRASH_DUMP */
 
 void __init
 setup_arch (char **cmdline_p)
Signature · 1 line
2.25.1
#3 lore raw

PATCH 2/3 ia64: Make reserve_elfcorehdr() static

In reply to Geert Uytterhoeven

There never was a reason for reserve_elfcorehdr() to be global. Make the function static, and move it before its sole caller.

Fixes cee87af2a5f75713 ("[IA64] kexec: Use EFI_LOADER_DATA for ELF core header")

---
This fixes a conflict triggered by
https://lore.kernel.org/r/c7e46e50aaf87ef49bdaa61358d25b122f32b7df.1628670468.git.geert+renesas@glider.be/
and fixed by
https://lore.kernel.org/r/f6eabbbce0fba6da3da0264c1e1cf23c01173999.1629884393.git.geert+renesas@glider.be

 arch/ia64/include/asm/meminit.h |  1 -
 arch/ia64/kernel/setup.c        | 51 ++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 27 deletions(-)
arch/ia64/include/asm/meminit.h +0 -1
index 6c47a239fc26df12..2738f62b5f989492 100644
@@ -40,7 +40,6 @@ extern unsigned long efi_memmap_init(u64 *s, u64 *e);
 extern int find_max_min_low_pfn (u64, u64, void *);
 
 extern unsigned long vmcore_find_descriptor_size(unsigned long address);
-extern int reserve_elfcorehdr(u64 *start, u64 *end);
 
 /*
  * For rounding an address to the next IA64_GRANULE_SIZE or order
arch/ia64/kernel/setup.c +25 -26

63 lines not on this page · raw message

Signature · 1 line
2.25.1
Reviewed-by on v1 2/3
#4 lore raw

Re: [PATCH 2/3] ia64: Make reserve_elfcorehdr() static

Quoted 5 lines · Geert Uytterhoeven

There never was a reason for reserve_elfcorehdr() to be global. Make the function static, and move it before its sole caller.

Fixes cee87af2a5f75713 ("[IA64] kexec: Use EFI_LOADER_DATA for ELF core header")
Quoted 8 lines

---
This fixes a conflict triggered by
https://lore.kernel.org/r/c7e46e50aaf87ef49bdaa61358d25b122f32b7df.1628670468.git.geert+renesas@glider.be/
and fixed by
https://lore.kernel.org/r/f6eabbbce0fba6da3da0264c1e1cf23c01173999.1629884393.git.geert+renesas@glider.be

 arch/ia64/include/asm/meminit.h |  1 -
 arch/ia64/kernel/setup.c        | 51 ++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 27 deletions(-)

...

#5 lore raw

PATCH 3/3 ia64: Make num_rsvd_regions static

In reply to Geert Uytterhoeven

Commit f62800992e5917f2 ("ia64: switch to NO_BOOTMEM") removed the last user of num_rsvd_regions outside arch/ia64/kernel/setup.c.

---
 arch/ia64/include/asm/meminit.h | 1 -
 arch/ia64/kernel/setup.c        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
arch/ia64/include/asm/meminit.h +0 -1
index 2738f62b5f989492..f1d5bf2ba847a135 100644
@@ -29,7 +29,6 @@ struct rsvd_region {
 };
 
 extern struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1];
-extern int num_rsvd_regions;
 
 extern void find_memory (void);
 extern void reserve_memory (void);
arch/ia64/kernel/setup.c +1 -1
index 5e6ee8939092a2df..31fb84de2d21469a 100644
@@ -131,7 +131,7 @@ unsigned long ia64_cache_stride_shift = ~0;
  * We use a special marker for the end of memory and it uses the extra (+1) slot
  */
 struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1] __initdata;
-int num_rsvd_regions __initdata;
+static int num_rsvd_regions __initdata;
 
 
 /*
Signature · 1 line
2.25.1
Reviewed-by on v1 3/3
#6 lore raw

Re: [PATCH 3/3] ia64: Make num_rsvd_regions static

Quoted 4 lines · Geert Uytterhoeven

Commit f62800992e5917f2 ("ia64: switch to NO_BOOTMEM") removed the last user of num_rsvd_regions outside arch/ia64/kernel/setup.c.

Quoted 33 lines
---
 arch/ia64/include/asm/meminit.h | 1 -
 arch/ia64/kernel/setup.c        | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)
arch/ia64/include/asm/meminit.h +0 -1
index 2738f62b5f989492..f1d5bf2ba847a135 100644
@@ -29,7 +29,6 @@ struct rsvd_region {
 };
 
 extern struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1];
-extern int num_rsvd_regions;
 
 extern void find_memory (void);
 extern void reserve_memory (void);
arch/ia64/kernel/setup.c +1 -1
index 5e6ee8939092a2df..31fb84de2d21469a 100644
@@ -131,7 +131,7 @@ unsigned long ia64_cache_stride_shift = ~0;
  * We use a special marker for the end of memory and it uses the extra (+1) slot
  */
 struct rsvd_region rsvd_region[IA64_MAX_RSVD_REGIONS + 1] __initdata;
-int num_rsvd_regions __initdata;
+static int num_rsvd_regions __initdata;
 
 
 /*
Signature · 1 line
2.25.1