summaryrefslogtreecommitdiffstats
path: root/mm/memblock.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2017-02-24 14:55:54 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2017-02-24 17:46:53 -0800
commit7409c5f738c879f7595b46314635c02c4c162484 (patch)
tree8465e72624d3a19ad780ffdbdbabcb6d3e3bbd26 /mm/memblock.c
parent997126bbc58e432e5f26ecec4498229003df1c66 (diff)
downloadlinux-stable-7409c5f738c879f7595b46314635c02c4c162484.tar.gz
linux-stable-7409c5f738c879f7595b46314635c02c4c162484.tar.bz2
linux-stable-7409c5f738c879f7595b46314635c02c4c162484.zip
memblock: let memblock_type_name know about physmem type
Since commit 70210ed950b5 ("mm/memblock: add physical memory list") the memblock structure knows about a physical memory list. memblock_type_name() should return "physmem" instead of "unknown" if the name of the physmem memblock_type is being asked for. Link: http://lkml.kernel.org/r/20170120123456.46508-2-heiko.carstens@de.ibm.com Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com> Cc: Philipp Hachtmann <phacht@linux.vnet.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'mm/memblock.c')
-rw-r--r--mm/memblock.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/mm/memblock.c b/mm/memblock.c
index c004f52be419..f82c65aace9a 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -72,6 +72,10 @@ memblock_type_name(struct memblock_type *type)
return "memory";
else if (type == &memblock.reserved)
return "reserved";
+#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP
+ else if (type == &memblock.physmem)
+ return "physmem";
+#endif
else
return "unknown";
}