aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2016-10-11 14:40:02 -0400
committerHelge Deller <deller@gmx.de>2016-10-11 14:52:12 -0400
commite3b6a02816ebbda3acfde2f079446ba92c97e70b (patch)
tree1414f6d618b481545c01aee4aa6b0c35ad89bdac
parentf79b076eb3a8fa70662584f3ac63ab16787a79a0 (diff)
parisc: Zero-initialize newly alloced memblock
Commit 4fe9e1d957e4 ("parisc: Drop bootmem and switch to memblock") switched to the memblock allocator, but missed to zero-initialize the newly allocated memblocks. This lead to crashes on some machines like the rp3410. Fixes: 4fe9e1d957e4 ("parisc: Drop bootmem and switch to memblock") Signed-off-by: Helge Deller <deller@gmx.de>
-rw-r--r--arch/parisc/mm/init.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/parisc/mm/init.c b/arch/parisc/mm/init.c
index 356f38473b5d..e02ada312be8 100644
--- a/arch/parisc/mm/init.c
+++ b/arch/parisc/mm/init.c
@@ -105,6 +105,8 @@ static void * __init get_memblock(unsigned long size)
105 else 105 else
106 panic("get_memblock() failed.\n"); 106 panic("get_memblock() failed.\n");
107 107
108 memset(__va(phys), 0, size);
109
108 return __va(phys); 110 return __va(phys);
109} 111}
110 112