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

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
...@@ -57,7 +57,7 @@ pte_t __ref *vmem_pte_alloc(void) ...@@ -57,7 +57,7 @@ pte_t __ref *vmem_pte_alloc(void)
/* /*
* Add a physical memory range to the 1:1 mapping. * 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 pgt_prot, sgt_prot, r3_prot;
unsigned long pages4k, pages1m, pages2g; unsigned long pages4k, pages1m, pages2g;
...@@ -308,7 +308,7 @@ int vmem_add_mapping(unsigned long start, unsigned long size) ...@@ -308,7 +308,7 @@ int vmem_add_mapping(unsigned long start, unsigned long size)
return -ERANGE; return -ERANGE;
mutex_lock(&vmem_mutex); mutex_lock(&vmem_mutex);
ret = vmem_add_mem(start, size); ret = vmem_add_range(start, size);
if (ret) if (ret)
vmem_remove_range(start, size); vmem_remove_range(start, size);
mutex_unlock(&vmem_mutex); mutex_unlock(&vmem_mutex);
...@@ -325,7 +325,7 @@ void __init vmem_map_init(void) ...@@ -325,7 +325,7 @@ void __init vmem_map_init(void)
struct memblock_region *reg; struct memblock_region *reg;
for_each_memblock(memory, 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, __set_memory((unsigned long)_stext,
(unsigned long)(_etext - _stext) >> PAGE_SHIFT, (unsigned long)(_etext - _stext) >> PAGE_SHIFT,
SET_MEMORY_RO | SET_MEMORY_X); SET_MEMORY_RO | SET_MEMORY_X);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment