summaryrefslogtreecommitdiffstats
path: root/arch/xtensa/include
diff options
context:
space:
mode:
authorMax Filippov2016-04-25 21:08:20 +0200
committerMax Filippov2016-07-24 05:34:00 +0200
commit0e46c1115f5816949220d62dd3ff04aa68e7ac6b (patch)
tree2a2ed0cfd8424a3090432128a865f02c009e9214 /arch/xtensa/include
parentxtensa: minimize use of PLATFORM_DEFAULT_MEM_{ADDR,SIZE} (diff)
downloadkernel-qcow2-linux-0e46c1115f5816949220d62dd3ff04aa68e7ac6b.tar.gz
kernel-qcow2-linux-0e46c1115f5816949220d62dd3ff04aa68e7ac6b.tar.xz
kernel-qcow2-linux-0e46c1115f5816949220d62dd3ff04aa68e7ac6b.zip
xtensa: drop sysmem and switch to memblock
Memblock is the standard kernel boot-time memory tracker/allocator. Use it instead of the custom sysmem allocator. This allows using kmemleak, CMA and device tree memory reservation. Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Diffstat (limited to 'arch/xtensa/include')
-rw-r--r--arch/xtensa/include/asm/sysmem.h21
1 files changed, 1 insertions, 20 deletions
diff --git a/arch/xtensa/include/asm/sysmem.h b/arch/xtensa/include/asm/sysmem.h
index c015c5c8e3f7..552cdfd8590e 100644
--- a/arch/xtensa/include/asm/sysmem.h
+++ b/arch/xtensa/include/asm/sysmem.h
@@ -11,27 +11,8 @@
#ifndef _XTENSA_SYSMEM_H
#define _XTENSA_SYSMEM_H
-#define SYSMEM_BANKS_MAX 31
+#include <linux/memblock.h>
-struct meminfo {
- unsigned long start;
- unsigned long end;
-};
-
-/*
- * Bank array is sorted by .start.
- * Banks don't overlap and there's at least one page gap
- * between adjacent bank entries.
- */
-struct sysmem_info {
- int nr_banks;
- struct meminfo bank[SYSMEM_BANKS_MAX];
-};
-
-extern struct sysmem_info sysmem;
-
-int add_sysmem_bank(unsigned long start, unsigned long end);
-int mem_reserve(unsigned long, unsigned long, int);
void bootmem_init(void);
void zones_init(void);