Commit f5637d3b authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Linus Torvalds
Browse files

mm/memory_hotplug: rename mhp_restrictions to mhp_params 



The mhp_restrictions struct really doesn't specify anything resembling a
restriction anymore so rename it to be mhp_params as it is a list of
extended parameters.

Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarDavid Hildenbrand <david@redhat.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Christoph Hellwig <hch@lst.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Eric Badger <ebadger@gigaio.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jason Gunthorpe <jgg@ziepe.ca>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Link: http://lkml.kernel.org/r/20200306170846.9333-3-logang@deltatee.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 96c6b598

arch/arm64/mm/mmu.c

+2 −2
Original line number Diff line number Diff line
@@ -1374,7 +1374,7 @@ static void __remove_pgd_mapping(pgd_t *pgdir, unsigned long start, u64 size) 
}



int arch_add_memory(int nid, u64 start, u64 size,

			struct mhp_restrictions *restrictions)

		    struct mhp_params *params)

{

	int ret, flags = 0;
@@ -1387,7 +1387,7 @@ int arch_add_memory(int nid, u64 start, u64 size, 
	memblock_clear_nomap(start, size);



	ret = __add_pages(nid, start >> PAGE_SHIFT, size >> PAGE_SHIFT,

			   restrictions);

			   params);

	if (ret)

		__remove_pgd_mapping(swapper_pg_dir,

				     __phys_to_virt(start), size);

arch/ia64/mm/init.c

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


#ifdef CONFIG_MEMORY_HOTPLUG

int arch_add_memory(int nid, u64 start, u64 size,

			struct mhp_restrictions *restrictions)

		    struct mhp_params *params)

{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;

	int ret;



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

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

	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
@@ -122,7 +122,7 @@ static void flush_dcache_range_chunked(unsigned long start, unsigned long stop, 
}



int __ref arch_add_memory(int nid, u64 start, u64 size,

			struct mhp_restrictions *restrictions)

			  struct mhp_params *params)

{

	unsigned long start_pfn = start >> PAGE_SHIFT;

	unsigned long nr_pages = size >> PAGE_SHIFT;
@@ -138,7 +138,7 @@ int __ref arch_add_memory(int nid, u64 start, u64 size, 
		return -EFAULT;

	}



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

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

}



void __ref arch_remove_memory(int nid, u64 start, u64 size,

arch/s390/mm/init.c

+3 −3
Original line number Diff line number Diff line
@@ -268,20 +268,20 @@ device_initcall(s390_cma_mem_init); 
#endif /* CONFIG_CMA */



int arch_add_memory(int nid, u64 start, u64 size,

		struct mhp_restrictions *restrictions)

		    struct mhp_params *params)

{

	unsigned long start_pfn = PFN_DOWN(start);

	unsigned long size_pages = PFN_DOWN(size);

	int rc;



	if (WARN_ON_ONCE(restrictions->altmap))

	if (WARN_ON_ONCE(params->altmap))

		return -EINVAL;



	rc = vmem_add_mapping(start, size);

	if (rc)

		return rc;



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

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

	if (rc)

		vmem_remove_mapping(start, size);

	return rc;

arch/sh/mm/init.c

+2 −2
Original line number Diff line number Diff line
@@ -406,14 +406,14 @@ void __init mem_init(void) 


#ifdef CONFIG_MEMORY_HOTPLUG

int arch_add_memory(int nid, u64 start, u64 size,

			struct mhp_restrictions *restrictions)

		    struct mhp_params *params)

{

	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, restrictions);

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

	if (unlikely(ret))

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE