From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + add-remove_memory-for-ppc64-2.patch added to -mm tree Date: Wed, 31 Oct 2007 15:58:33 -0700 Message-ID: <20071031225833.66C04432BF5@localhost> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp-out.google.com ([216.239.33.17]:29176 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752870AbXJaW7P (ORCPT ); Wed, 31 Oct 2007 18:59:15 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: pbadari@us.ibm.com, benh@kernel.crashing.org, galak@gate.crashing.org, haveblue@us.ibm.com, kamezawa.hiroyu@jp.fujitsu.com, paulus@samba.org, tony.luck@intel.com The patch titled add remove_memory() for ppc64 has been added to the -mm tree. Its filename is add-remove_memory-for-ppc64-2.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: add remove_memory() for ppc64 From: Badari Pulavarty remove_memory() is common across ia64, ppc64. There is no point in providing exactly same arch-specific routines. Make this generic and add arch-specific hooks if needed by any other archs. Signed-off-by: Badari Pulavarty Cc: Dave Hansen Cc: KAMEZAWA Hiroyuki Cc: Paul Mackerras Cc: Benjamin Herrenschmidt Cc: Kumar Gala Cc: "Luck, Tony" Signed-off-by: Andrew Morton --- arch/ia64/mm/init.c | 17 ----------------- mm/memory_hotplug.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 17 deletions(-) diff -puN arch/ia64/mm/init.c~add-remove_memory-for-ppc64-2 arch/ia64/mm/init.c --- a/arch/ia64/mm/init.c~add-remove_memory-for-ppc64-2 +++ a/arch/ia64/mm/init.c @@ -718,21 +718,4 @@ int arch_add_memory(int nid, u64 start, return ret; } -#ifdef CONFIG_MEMORY_HOTREMOVE -int remove_memory(u64 start, u64 size) -{ - unsigned long start_pfn, end_pfn; - unsigned long timeout = 120 * HZ; - int ret; - start_pfn = start >> PAGE_SHIFT; - end_pfn = start_pfn + (size >> PAGE_SHIFT); - ret = offline_pages(start_pfn, end_pfn, timeout); - if (ret) - goto out; - /* we can free mem_map at this point */ -out: - return ret; -} -EXPORT_SYMBOL_GPL(remove_memory); -#endif /* CONFIG_MEMORY_HOTREMOVE */ #endif diff -puN mm/memory_hotplug.c~add-remove_memory-for-ppc64-2 mm/memory_hotplug.c --- a/mm/memory_hotplug.c~add-remove_memory-for-ppc64-2 +++ a/mm/memory_hotplug.c @@ -653,6 +653,22 @@ failed_removal: return ret; } + +int remove_memory(u64 start, u64 size) +{ + unsigned long start_pfn, end_pfn; + int ret; + + start_pfn = start >> PAGE_SHIFT; + end_pfn = start_pfn + (size >> PAGE_SHIFT); + ret = offline_pages(start_pfn, end_pfn, 120 * HZ); + if (ret) + goto out; + /* we can free mem_map at this point */ +out: + return ret; +} +EXPORT_SYMBOL_GPL(remove_memory); #else int remove_memory(u64 start, u64 size) { _ Patches currently in -mm which might be from pbadari@us.ibm.com are powerpc-move-_rtc_time-routines-under-config_adb_cuda.patch hugetlb-allow-sticky-directory-mount-option.patch memory-hotplug-add-removable-to-sysfs-to-show-memblock-removability.patch add-remove_memory-for-ppc64-2.patch enable-hotplug-memory-remove-for-ppc64.patch add-arch-specific-walk_memory_remove-for-ppc64.patch mem-controller-gfp-mask-fix.patch