redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: keystone2: rename init_meminfo to pv_fixup 

The init_meminfo() method is not about initialising meminfo - it's about
fixing up the physical to virtual translation so that we use a different
physical address space, possibly above the 4GB physical address space.
Therefore, the name "init_meminfo()" is confusing.

Rename it to pv_fixup() instead.

Acked-by: Santosh Shilimkar <ssantosh@kernel.org>
Tested-by: Murali Karicheri <m-karicheri2@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
hifive-unleashed-5.1
Russell King 2015-04-04 10:01:10 +01:00
parent 39b74fe82f
commit c0b759d87e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/mach/arch.h
View File

@ -51,7 +51,7 @@ struct machine_desc {
bool (*smp_init)(void);
void (*fixup)(struct tag *, char **);
void (*dt_fixup)(void);
long long (*init_meminfo)(void);
long long (*pv_fixup)(void);
void (*reserve)(void);/* reserve mem blocks */
void (*map_io)(void);/* IO mapping function */
void (*init_early)(void);

4
arch/arm/mach-keystone/keystone.c
View File

@ -68,7 +68,7 @@ static phys_addr_t keystone_virt_to_idmap(unsigned long x)
return (phys_addr_t)(x) - CONFIG_PAGE_OFFSET + KEYSTONE_LOW_PHYS_START;
}
static long long __init keystone_init_meminfo(void)
static long long __init keystone_pv_fixup(void)
{
long long offset;
phys_addr_t mem_start, mem_end;
@ -108,5 +108,5 @@ DT_MACHINE_START(KEYSTONE, "Keystone")
.smp = smp_ops(keystone_smp_ops),
.init_machine = keystone_init,
.dt_compat = keystone_match,
.init_meminfo = keystone_init_meminfo,
.pv_fixup = keystone_pv_fixup,
MACHINE_END

8
arch/arm/mm/mmu.c
View File

@ -1404,7 +1404,7 @@ void __init early_paging_init(const struct machine_desc *mdesc,
phys_addr_t phys;
int i;
if (!(mdesc->init_meminfo))
if (!mdesc->pv_fixup)
return;
/* remap kernel code and data */
@ -1420,7 +1420,7 @@ void __init early_paging_init(const struct machine_desc *mdesc,
pudk = pud_offset(pgdk, map_start);
pmdk = pmd_offset(pudk, map_start);
offset = mdesc->init_meminfo();
offset = mdesc->pv_fixup();
if (offset == 0)
return;
@ -1514,10 +1514,10 @@ void __init early_paging_init(const struct machine_desc *mdesc,
{
long long offset;
if (!mdesc->init_meminfo)
if (!mdesc->pv_fixup)
return;
offset = mdesc->init_meminfo();
offset = mdesc->pv_fixup();
if (offset == 0)
return;