Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f60892d3 authored by Will Deacon's avatar Will Deacon Committed by Russell King
Browse files

ARM: 6673/1: LPAE: use phys_addr_t instead of unsigned long for start of membanks 



The unsigned long datatype is not sufficient for mapping physical addresses
>= 4GB.

This patch ensures that the phys_addr_t datatype is used to represent
the start address of a membank, which may reside above the 4GB boundary.

Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e33b9d08

arch/arm/include/asm/setup.h

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn } 
#endif



struct membank {

	unsigned long start;

	phys_addr_t start;

	unsigned long size;

	unsigned int highmem;

};

arch/arm/kernel/setup.c

+3 −2
Original line number Diff line number Diff line
@@ -442,7 +442,7 @@ static struct machine_desc * __init setup_machine(unsigned int nr) 
	return list;

}



static int __init arm_add_memory(unsigned long start, unsigned long size)

static int __init arm_add_memory(phys_addr_t start, unsigned long size)

{

	struct membank *bank = &meminfo.bank[meminfo.nr_banks];
@@ -478,7 +478,8 @@ static int __init arm_add_memory(unsigned long start, unsigned long size) 
static int __init early_mem(char *p)

{

	static int usermem __initdata = 0;

	unsigned long size, start;

	unsigned long size;

	phys_addr_t start;

	char *endp;



	/*