Commit 8398b226 authored by David Hildenbrand's avatar David Hildenbrand Committed by Heiko Carstens
Browse files

s390/vmem: rename vmem_add_mem() to vmem_add_range() 



Let's match the name to vmem_remove_range().

Cc: Vasily Gorbik <gor@linux.ibm.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Gerald Schaefer <gerald.schaefer@de.ibm.com>
Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Message-Id: <20200722094558.9828-2-david@redhat.com>
Signed-off-by: default avatarHeiko Carstens <hca@linux.ibm.com>
parent 73d6eb48

arch/s390/mm/vmem.c

+3 −3
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ pte_t __ref *vmem_pte_alloc(void) 
/*

 * Add a physical memory range to the 1:1 mapping.

 */

static int vmem_add_mem(unsigned long start, unsigned long size)

static int vmem_add_range(unsigned long start, unsigned long size)

{

	unsigned long pgt_prot, sgt_prot, r3_prot;

	unsigned long pages4k, pages1m, pages2g;
@@ -308,7 +308,7 @@ int vmem_add_mapping(unsigned long start, unsigned long size) 
		return -ERANGE;



	mutex_lock(&vmem_mutex);

	ret = vmem_add_mem(start, size);

	ret = vmem_add_range(start, size);

	if (ret)

		vmem_remove_range(start, size);

	mutex_unlock(&vmem_mutex);
@@ -325,7 +325,7 @@ void __init vmem_map_init(void) 
	struct memblock_region *reg;



	for_each_memblock(memory, reg)

		vmem_add_mem(reg->base, reg->size);

		vmem_add_range(reg->base, reg->size);

	__set_memory((unsigned long)_stext,

		     (unsigned long)(_etext - _stext) >> PAGE_SHIFT,

		     SET_MEMORY_RO | SET_MEMORY_X);

CRA Git | Maintained and supported by SUSTech CRA and CCSE