Eric Lee / smarc-ti-linux-kernel | Embedian Git Server

Commit 80d6170a289a1201480242d3570c5d7606ea1de9

Authored by Jesper Nilsson 2014-10-07 19:03:17 +0800

Exists in ti-lsk-linux-4.1.y and in 10 other branches

CRIS: Update init memory handling

- Add free_initrd_mem as found by Guenter Roeck <linux@roeck-us.net>
- Add free_init_pages
- Export empty_zero_page symbol

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>

Showing 1 changed file with 33 additions and 5 deletions Inline Diff

arch/cris/mm/init.c

arch/cris/mm/init.c

Diff comments View file @ 80d6170

 /*
  *  linux/arch/cris/mm/init.c
  *
  *  Copyright (C) 1995  Linus Torvalds
  *  Copyright (C) 2000,2001  Axis Communications AB
  *
  *  Authors:  Bjorn Wesen (bjornw@axis.com)
  *
  */
 #include <linux/gfp.h>
 #include <linux/init.h>
 #include <linux/bootmem.h>
+#include <linux/proc_fs.h>
+#include <linux/kcore.h>
 #include <asm/tlb.h>
 #include <asm/sections.h>
 unsigned long empty_zero_page;
+EXPORT_SYMBOL(empty_zero_page);
-void __init
+void __init mem_init(void)
-mem_init(void)
 {
 	BUG_ON(!mem_map);
 	/* max/min_low_pfn was set by setup.c
 	 * now we just copy it to some other necessary places...
 	 *
 	 * high_memory was also set in setup.c
 	 */
 	max_mapnr = max_low_pfn - min_low_pfn;
         free_all_bootmem();
 	mem_init_print_info(NULL);
 }
-/* free the pages occupied by initialization code */
+/* Free a range of init pages. Virtual addresses. */
-void
+void free_init_pages(const char *what, unsigned long begin, unsigned long end)
-free_initmem(void)
 {
+	unsigned long addr;
+	for (addr = begin; addr < end; addr += PAGE_SIZE) {
+		ClearPageReserved(virt_to_page(addr));
+		init_page_count(virt_to_page(addr));
+		free_page(addr);
+		totalram_pages++;
+	}
+	printk(KERN_INFO "Freeing %s: %ldk freed\n", what, (end - begin) >> 10);
+}
+/* Free the pages occupied by initialization code. */
+void free_initmem(void)
+{
 	free_initmem_default(-1);
 }
+/* Free the pages occupied by initrd code. */
+#ifdef CONFIG_BLK_DEV_INITRD
+void free_initrd_mem(unsigned long start, unsigned long end)
+{
+	free_init_pages("initrd memory",
+	                start,
+	                end);
+}