diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-20 18:35:16 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-20 18:35:16 +0300 |
| commit | 1d51b4b1d3f2db0d6d144175e31a84e472fbd99a (patch) | |
| tree | 9575f8872b09620393a1d6c4ed26a2ef3bce57a2 /arch/m68k/kernel | |
| parent | c0f3ece4657fe2205c1e59c5c27547d6e8cba34a (diff) | |
| parent | bed1369f51901b17108a4bb4f7210aab183bea42 (diff) | |
| download | linux-1d51b4b1d3f2db0d6d144175e31a84e472fbd99a.tar.xz | |
Merge tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fix from Geert Uytterhoeven:
"Fix memblock-related crashes"
* tag 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Fix memblock-related crashes
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/setup_mm.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/m68k/kernel/setup_mm.c b/arch/m68k/kernel/setup_mm.c index a1a3eaeaf58c..ad0195cbe042 100644 --- a/arch/m68k/kernel/setup_mm.c +++ b/arch/m68k/kernel/setup_mm.c @@ -164,8 +164,6 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record) be32_to_cpu(m->addr); m68k_memory[m68k_num_memory].size = be32_to_cpu(m->size); - memblock_add(m68k_memory[m68k_num_memory].addr, - m68k_memory[m68k_num_memory].size); m68k_num_memory++; } else pr_warn("%s: too many memory chunks\n", |