Commit 3d79a728 authored by Michal Hocko's avatar Michal Hocko Committed by Linus Torvalds
Browse files

mm, memory_hotplug: replace for_device by want_memblock in arch_add_memory 

arch_add_memory gets for_device argument which then controls whether we
want to create memblocks for created memory sections.  Simplify the
logic by telling whether we want memblocks directly rather than going
through pointless negation.  This also makes the api easier to
understand because it is clear what we want rather than nothing telling
for_device which can mean anything.

This shouldn't introduce any functional change.

Link: http://lkml.kernel.org/r/20170515085827.16474-13-mhocko@kernel.org


Signed-off-by: default avatarMichal Hocko <mhocko@suse.com>
Tested-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarVlastimil Babka <vbabka@suse.cz>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Balbir Singh <bsingharora@gmail.com>
Cc: Daniel Kiper <daniel.kiper@oracle.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Jerome Glisse <jglisse@redhat.com>
Cc: Joonsoo Kim <js1304@gmail.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Mel Gorman <mgorman@suse.de>
Cc: Reza Arbab <arbab@linux.vnet.ibm.com>
Cc: Tobias Regnery <tobias.regnery@gmail.com>
Cc: Toshi Kani <toshi.kani@hpe.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Xishi Qiu <qiuxishi@huawei.com>
Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent c246a213

arch/ia64/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -646,13 +646,13 @@ mem_init (void) 
}



#ifdef CONFIG_MEMORY_HOTPLUG

int arch_add_memory(int nid, u64 start, u64 size, bool for_device)

int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock)

{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;

	int ret;



	ret = __add_pages(nid, start_pfn, nr_pages, !for_device);

	ret = __add_pages(nid, start_pfn, nr_pages, want_memblock);

	if (ret)

		printk("%s: Problem encountered in __add_pages() as ret=%d\n",

		       __func__,  ret);

arch/powerpc/mm/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ int __weak remove_section_mapping(unsigned long start, unsigned long end) 
	return -ENODEV;

}



int arch_add_memory(int nid, u64 start, u64 size, bool for_device)

int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock)

{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;
@@ -143,7 +143,7 @@ int arch_add_memory(int nid, u64 start, u64 size, bool for_device) 
		return -EFAULT;

	}



	return __add_pages(nid, start_pfn, nr_pages, !for_device);

	return __add_pages(nid, start_pfn, nr_pages, want_memblock);

}



#ifdef CONFIG_MEMORY_HOTREMOVE

arch/s390/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ unsigned long memory_block_size_bytes(void) 
}



#ifdef CONFIG_MEMORY_HOTPLUG

int arch_add_memory(int nid, u64 start, u64 size, bool for_device)

int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock)

{

	unsigned long start_pfn = PFN_DOWN(start);

	unsigned long size_pages = PFN_DOWN(size);
@@ -176,7 +176,7 @@ int arch_add_memory(int nid, u64 start, u64 size, bool for_device) 
	if (rc)

		return rc;



	rc = __add_pages(nid, start_pfn, size_pages, !for_device);

	rc = __add_pages(nid, start_pfn, size_pages, want_memblock);

	if (rc)

		vmem_remove_mapping(start, size);

	return rc;

arch/sh/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -485,14 +485,14 @@ void free_initrd_mem(unsigned long start, unsigned long end) 
#endif



#ifdef CONFIG_MEMORY_HOTPLUG

int arch_add_memory(int nid, u64 start, u64 size, bool for_device)

int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock)

{

	unsigned long start_pfn = PFN_DOWN(start);

	unsigned long nr_pages = size >> PAGE_SHIFT;

	int ret;



	/* We only have ZONE_NORMAL, so this is easy.. */

	ret = __add_pages(nid, start_pfn, nr_pages, !for_device);

	ret = __add_pages(nid, start_pfn, nr_pages, want_memblock);

	if (unlikely(ret))

		printk("%s: Failed, __add_pages() == %d\n", __func__, ret);

arch/x86/mm/init_32.c

+2 −2
Original line number Diff line number Diff line
@@ -823,12 +823,12 @@ void __init mem_init(void) 
}



#ifdef CONFIG_MEMORY_HOTPLUG

int arch_add_memory(int nid, u64 start, u64 size, bool for_device)

int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock)

{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;



	return __add_pages(nid, start_pfn, nr_pages, !for_device);

	return __add_pages(nid, start_pfn, nr_pages, want_memblock);

}



#ifdef CONFIG_MEMORY_HOTREMOVE

CRA Git | Maintained and supported by SUSTech CRA and CCSE