diff options
| author | Philipp Hachtmann <phacht@linux.vnet.ibm.com> | 2014-01-29 18:16:01 +0100 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2014-05-20 08:58:40 +0200 |
| commit | 50be634507284eea38df78154d22615d21200b42 (patch) | |
| tree | 427a1302d043bb64b5d4d01c0459f7b4a2282110 /arch/s390/include/asm/setup.h | |
| parent | 70210ed950b538ee7eb811dccc402db9df1c9be4 (diff) | |
| download | op-kernel-dev-50be634507284eea38df78154d22615d21200b42.zip op-kernel-dev-50be634507284eea38df78154d22615d21200b42.tar.gz | |
s390/mm: Convert bootmem to memblock
The original bootmem allocator is getting replaced by memblock. To
cover the needs of the s390 kdump implementation the physical memory
list is used.
With this patch the bootmem allocator and its bitmaps are completely
removed from s390.
Signed-off-by: Philipp Hachtmann <phacht@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390/include/asm/setup.h')
| -rw-r--r-- | arch/s390/include/asm/setup.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/arch/s390/include/asm/setup.h b/arch/s390/include/asm/setup.h index b31b22d..089a498 100644 --- a/arch/s390/include/asm/setup.h +++ b/arch/s390/include/asm/setup.h @@ -9,7 +9,6 @@ #define PARMAREA 0x10400 -#define MEMORY_CHUNKS 256 #ifndef __ASSEMBLY__ @@ -31,22 +30,11 @@ #endif /* CONFIG_64BIT */ #define COMMAND_LINE ((char *) (0x10480)) -#define CHUNK_READ_WRITE 0 -#define CHUNK_READ_ONLY 1 - -struct mem_chunk { - unsigned long addr; - unsigned long size; - int type; -}; - -extern struct mem_chunk memory_chunk[]; extern int memory_end_set; extern unsigned long memory_end; +extern unsigned long max_physmem_end; -void detect_memory_layout(struct mem_chunk chunk[], unsigned long maxsize); -void create_mem_hole(struct mem_chunk mem_chunk[], unsigned long addr, - unsigned long size); +extern void detect_memory_memblock(void); /* * Machine features detected in head.S |
