[RFC 2.6.11-rc2-mm2 2/7] mm: manual page migration -- cleanup 2
From: Ray Bryant <hidden>
Date: 2005-02-12 03:26:16
Also in:
lkml
This patch removes some remaining Memory HOTPLUG specific code from the page migration patch. I have sent Dave Hansen the -R version of this patch so that this code can be added back later at the start of the Memory HOTPLUG patches themselves. In particular, this patch removes some #ifdef CONFIG_MEMORY_HOTPLUG code from the page migration patch. Signed-off-by: Ray Bryant <redacted> Index: linux-2.6.11-rc2-mm2/mm/vmalloc.c ===================================================================
--- linux-2.6.11-rc2-mm2.orig/mm/vmalloc.c 2005-02-11 10:08:10.000000000 -0800
+++ linux-2.6.11-rc2-mm2/mm/vmalloc.c 2005-02-11 10:35:47.000000000 -0800@@ -523,16 +523,7 @@ EXPORT_SYMBOL(__vmalloc); */ void *vmalloc(unsigned long size) { -#ifdef CONFIG_MEMORY_HOTPLUG - /* - * XXXX: This is temprary code, which should be replaced with proper one - * after the scheme to specify hot removable region has defined. - * 25/Sep/2004 -- taka - */ - return __vmalloc(size, GFP_KERNEL, PAGE_KERNEL); -#else return __vmalloc(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL); -#endif } EXPORT_SYMBOL(vmalloc);
Index: linux-2.6.11-rc2-mm2/mm/shmem.c ===================================================================
--- linux-2.6.11-rc2-mm2.orig/mm/shmem.c 2005-02-11 10:08:10.000000000 -0800
+++ linux-2.6.11-rc2-mm2/mm/shmem.c 2005-02-11 10:35:47.000000000 -0800@@ -93,16 +93,7 @@ static inline struct page *shmem_dir_all * BLOCKS_PER_PAGE on indirect pages, assume PAGE_CACHE_SIZE: * might be reconsidered if it ever diverges from PAGE_SIZE. */ -#ifdef CONFIG_MEMORY_HOTPLUG - /* - * XXXX: This is temprary code, which should be replaced with proper one - * after the scheme to specify hot removable region has defined. - * 25/Sep/2004 -- taka - */ - return alloc_pages(gfp_mask & ~__GFP_HIGHMEM, PAGE_CACHE_SHIFT-PAGE_SHIFT); -#else return alloc_pages(gfp_mask, PAGE_CACHE_SHIFT-PAGE_SHIFT); -#endif } static inline void shmem_dir_free(struct page *page)
--
Best Regards,
Ray
-----------------------------------------------
Ray Bryant raybry@sgi.com
The box said: "Requires Windows 98 or better",
so I installed Linux.
-----------------------------------------------
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"aart@kvack.org"> aart@kvack.org </a>