Skip to contentSkip to conversation

csky: use generic free_initrd_mem()

PATCH In review Mike Rapoport 2 participants 4 messages Aug 28, 2019 C-sky architecture

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 csky: use generic free_initrd_mem()

The csky implementation of free_initrd_mem() is an open-coded version of free_reserved_area() without poisoning.

Remove it and make csky use the generic version of free_initrd_mem().

---
 arch/csky/mm/init.c | 16 ----------------
 1 file changed, 16 deletions(-)
arch/csky/mm/init.c +0 -16
index eb0dc9e..d4c2292 100644
@@ -60,22 +60,6 @@ void __init mem_init(void)
 	mem_init_print_info(NULL);
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-	if (start < end)
-		pr_info("Freeing initrd memory: %ldk freed\n",
-			(end - start) >> 10);
-
-	for (; start < end; start += PAGE_SIZE) {
-		ClearPageReserved(virt_to_page(start));
-		init_page_count(virt_to_page(start));
-		free_page(start);
-		totalram_pages_inc();
-	}
-}
-#endif
-
 extern char __init_begin[], __init_end[];
 
 void free_initmem(void)
Signature · 1 line
2.7.4
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 41 lines · Mike Rapoport

The csky implementation of free_initrd_mem() is an open-coded version of free_reserved_area() without poisoning.

Remove it and make csky use the generic version of free_initrd_mem().

---
 arch/csky/mm/init.c | 16 ----------------
 1 file changed, 16 deletions(-)
arch/csky/mm/init.c +0 -17
index eb0dc9e..d4c2292 100644
@@ -60,22 +60,6 @@ void __init mem_init(void)
        mem_init_print_info(NULL);
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-       if (start < end)
-               pr_info("Freeing initrd memory: %ldk freed\n",
-                       (end - start) >> 10);
-
-       for (; start < end; start += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(start));
-               init_page_count(virt_to_page(start));
-               free_page(start);
-               totalram_pages_inc();
-       }
-}
-#endif
-
 extern char __init_begin[], __init_end[];
 
 void free_initmem(void)
--

2.7.4

Signature · 4 lines
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/
#2 lore raw

Hi,

Quoted 1 line · Guo Ren

Do you mind taking it via csky tree?

Quoted 50 lines · Mike Rapoport
Quoted 41 lines

The csky implementation of free_initrd_mem() is an open-coded version of free_reserved_area() without poisoning.

Remove it and make csky use the generic version of free_initrd_mem().

---
 arch/csky/mm/init.c | 16 ----------------
 1 file changed, 16 deletions(-)
arch/csky/mm/init.c +0 -17
index eb0dc9e..d4c2292 100644
@@ -60,22 +60,6 @@ void __init mem_init(void)
        mem_init_print_info(NULL);
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-       if (start < end)
-               pr_info("Freeing initrd memory: %ldk freed\n",
-                       (end - start) >> 10);
-
-       for (; start < end; start += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(start));
-               init_page_count(virt_to_page(start));
-               free_page(start);
-               totalram_pages_inc();
-       }
-}
-#endif
-
 extern char __init_begin[], __init_end[];
 
 void free_initmem(void)
--

2.7.4

Signature · 4 lines
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/
Signature · 2 lines
Sincerely yours,
Mike.
maintainer
#3 lore raw

Sure, no problem.

Quoted 63 lines · Mike Rapoport

Hi,

Quoted 1 line · Guo Ren

Do you mind taking it via csky tree?

Quoted 48 lines · Mike Rapoport
Quoted 39 lines

The csky implementation of free_initrd_mem() is an open-coded version of free_reserved_area() without poisoning.

Remove it and make csky use the generic version of free_initrd_mem().

---
 arch/csky/mm/init.c | 16 ----------------
 1 file changed, 16 deletions(-)
arch/csky/mm/init.c +0 -17
index eb0dc9e..d4c2292 100644
@@ -60,22 +60,6 @@ void __init mem_init(void)
        mem_init_print_info(NULL);
 }
 
-#ifdef CONFIG_BLK_DEV_INITRD
-void free_initrd_mem(unsigned long start, unsigned long end)
-{
-       if (start < end)
-               pr_info("Freeing initrd memory: %ldk freed\n",
-                       (end - start) >> 10);
-
-       for (; start < end; start += PAGE_SIZE) {
-               ClearPageReserved(virt_to_page(start));
-               init_page_count(virt_to_page(start));
-               free_page(start);
-               totalram_pages_inc();
-       }
-}
-#endif
-
 extern char __init_begin[], __init_end[];
 
 void free_initmem(void)
--
Quoted 2 lines

2.7.4

--
Best Regards
Guo Ren

Quoted 2 lines

ML: https://lore.kernel.org/linux-csky/

--
Sincerely yours,
Mike.

Signature · 4 lines
Best Regards
 Guo Ren

ML: https://lore.kernel.org/linux-csky/