diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-10-09 14:14:46 +0200 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-10-12 12:01:36 +0200 |
| commit | e7ae8d174eec0b3b9de92b76abc15f3f53b98f1c (patch) | |
| tree | 63381d9d294584d5fc98e2ee4ea245e936f9d630 /arch/mips/txx9/rbtx4939 | |
| parent | 73826d604bbf31328108c6c2a93a7a8a13a74371 (diff) | |
| download | linux-stable-e7ae8d174eec0b3b9de92b76abc15f3f53b98f1c.tar.gz linux-stable-e7ae8d174eec0b3b9de92b76abc15f3f53b98f1c.tar.bz2 linux-stable-e7ae8d174eec0b3b9de92b76abc15f3f53b98f1c.zip | |
MIPS: replace add_memory_region with memblock
add_memory_region was the old interface for registering memory and
was already changed to used memblock internaly. Replace it by
directly calling memblock functions.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Diffstat (limited to 'arch/mips/txx9/rbtx4939')
| -rw-r--r-- | arch/mips/txx9/rbtx4939/prom.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/txx9/rbtx4939/prom.c b/arch/mips/txx9/rbtx4939/prom.c index 1dc47ce81c92..ba25ba1bd2ec 100644 --- a/arch/mips/txx9/rbtx4939/prom.c +++ b/arch/mips/txx9/rbtx4939/prom.c @@ -7,7 +7,7 @@ */ #include <linux/init.h> -#include <asm/bootinfo.h> +#include <linux/memblock.h> #include <asm/txx9/generic.h> #include <asm/txx9/rbtx4939.h> @@ -23,7 +23,7 @@ void __init rbtx4939_prom_init(void) win = ____raw_readq(&tx4939_ddrcptr->win[i]); start = (unsigned long)(win >> 48); size = (((unsigned long)(win >> 32) & 0xffff) + 1) - start; - add_memory_region(start << 20, size << 20, BOOT_MEM_RAM); + memblock_add(start << 20, size << 20); } txx9_sio_putchar_init(TX4939_SIO_REG(0) & 0xfffffffffULL); } |