Skip to contentSkip to conversation

xtensa: remove free_initrd_mem

PATCH Applied Mike Rapoport 2 participants 2 messages Jul 24, 2019 – Jul 25, 2019 Tensilica Xtensa port (xtensa)

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xtensa: remove free_initrd_mem

The xtensa free_initrd_mem() verifies that initrd is mapped and then frees its memory using free_reserved_area().

The initrd is considered mapped when its memory was successfully reserved with mem_reserve().

Resetting initrd_start to 0 in case of mem_reserve() failure allows to switch to generic free_initrd_mem() implementation.

---
 arch/xtensa/kernel/setup.c |  9 +++------
 arch/xtensa/mm/init.c      | 10 ----------
 2 files changed, 3 insertions(+), 16 deletions(-)
arch/xtensa/kernel/setup.c +3 -6
index 5cb8a62..63c865b 100644
@@ -61,7 +61,6 @@ struct screen_info screen_info = {
 #ifdef CONFIG_BLK_DEV_INITRD
 extern unsigned long initrd_start;
 extern unsigned long initrd_end;
-int initrd_is_mapped = 0;
 extern int initrd_below_start_ok;
 #endif
 
@@ -332,13 +331,11 @@ void __init setup_arch(char **cmdline_p)
 	/* Reserve some memory regions */
 
 #ifdef CONFIG_BLK_DEV_INITRD
-	if (initrd_start < initrd_end) {
-		initrd_is_mapped = mem_reserve(__pa(initrd_start),
-					       __pa(initrd_end)) == 0;
+	if (initrd_start < initrd_end &&
+	    !mem_reserve(__pa(initrd_start), __pa(initrd_end)))
 		initrd_below_start_ok = 1;
-	} else {
+	else
 		initrd_start = 0;
-	}
 #endif
 
 	mem_reserve(__pa(_stext), __pa(_end));
arch/xtensa/mm/init.c +0 -10
index 79467c7..d898ed6 100644
@@ -203,16 +203,6 @@ void __init mem_init(void)
 		(unsigned long)(__bss_stop - __bss_start) >> 10);
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-extern int initrd_is_mapped;
-
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-	if (initrd_is_mapped)
-		free_reserved_area((void *)start, (void *)end, -1, "initrd");
-}
-#endif
-
 static void __init parse_memmap_one(char *p)
 {
 	char *oldp;
Signature · 1 line
2.7.4
maintainer Applied
#1 lore raw
Quoted 7 lines · Mike Rapoport

The xtensa free_initrd_mem() verifies that initrd is mapped and then frees its memory using free_reserved_area().

The initrd is considered mapped when its memory was successfully reserved with mem_reserve().

Quoted 8 lines

Resetting initrd_start to 0 in case of mem_reserve() failure allows to switch to generic free_initrd_mem() implementation.

---
 arch/xtensa/kernel/setup.c |  9 +++------
 arch/xtensa/mm/init.c      | 10 ----------
 2 files changed, 3 insertions(+), 16 deletions(-)

Thanks, applied to my xtensa tree.

-- Max