hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Will Deacon 2011-02-15 12:44:10 +01:00 committed by Russell King
parent e33b9d0878
commit f60892d3e3
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,7 +199,7 @@ static struct tagtable __tagtable_##fn __tag = { tag, fn }
#endif #endif
struct membank { struct membank {
unsigned long start; phys_addr_t start;
unsigned long size; unsigned long size;
unsigned int highmem; unsigned int highmem;
}; };

5
arch/arm/kernel/setup.c
View File

@ -442,7 +442,7 @@ static struct machine_desc * __init setup_machine(unsigned int nr)
return list; 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]; 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 __init early_mem(char *p)
{ {
static int usermem __initdata = 0; static int usermem __initdata = 0;
unsigned long size, start; unsigned long size;
phys_addr_t start;
char *endp; char *endp;
/* /*