Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0197518c authored Feb 22, 2013 by Tang Chen Committed by Linus Torvalds Feb 23, 2013

memory-hotplug: remove memmap of sparse-vmemmap



Introduce a new API vmemmap_free() to free and remove vmemmap
pagetables.  Since pagetable implements are different, each architecture
has to provide its own version of vmemmap_free(), just like
vmemmap_populate().

Note: vmemmap_free() is not implemented for ia64, ppc, s390, and sparc.

[mhocko@suse.cz: fix implicit declaration of remove_pagetable]
Signed-off-by: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: Jianguo Wu <wujianguo@huawei.com>
Signed-off-by: Wen Congyang <wency@cn.fujitsu.com>
Signed-off-by: Tang Chen <tangchen@cn.fujitsu.com>
Cc: KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>
Cc: Jiang Liu <jiang.liu@huawei.com>
Cc: Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Lai Jiangshan <laijs@cn.fujitsu.com>
Cc: Wu Jianguo <wujianguo@huawei.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent bbcab878

arch/arm64/mm/mmu.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -434,4 +434,7 @@ int __meminit vmemmap_populate(struct page *start_page,
		return 0;
		}
		#endif /* CONFIG_ARM64_64K_PAGES */
		void vmemmap_free(struct page *memmap, unsigned long nr_pages)
		{
		}
		#endif /* CONFIG_SPARSEMEM_VMEMMAP */

arch/ia64/mm/discontig.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -823,4 +823,7 @@ int __meminit vmemmap_populate(struct page *start_page,
		return vmemmap_populate_basepages(start_page, size, node);
		}

		void vmemmap_free(struct page *memmap, unsigned long nr_pages)
		{
		}
		#endif

arch/powerpc/mm/init_64.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -298,5 +298,9 @@ int __meminit vmemmap_populate(struct page *start_page,
		return 0;
		}

		void vmemmap_free(struct page *memmap, unsigned long nr_pages)
		{
		}

		#endif /* CONFIG_SPARSEMEM_VMEMMAP */

arch/s390/mm/vmem.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -268,6 +268,10 @@ int __meminit vmemmap_populate(struct page *start, unsigned long nr, int node)
		return ret;
		}

		void vmemmap_free(struct page *memmap, unsigned long nr_pages)
		{
		}

		/*
		* Add memory segment to the segment list if it doesn't overlap with
		* an already present segment.

arch/sparc/mm/init_64.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -2236,6 +2236,10 @@ void __meminit vmemmap_populate_print_last(void)
		}
		}

		void vmemmap_free(struct page *memmap, unsigned long nr_pages)
		{
		}

		#endif /* CONFIG_SPARSEMEM_VMEMMAP */

		static void prot_init_common(unsigned long page_none,