Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-10 23:29:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

m68knommu: mm fixes needed for v5.8

Browse Source 
Two critical mm related fixes that affect booting of m68k/ColdFire devices.
 Both fix problems caused by recent system init memblock changes.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEmsfM6tQwfNjBOxr3TiQVqaG9L4AFAl7+XG0ACgkQTiQVqaG9
 L4AbEA/+IftsVUfFUfgJgf99ZiLfURwZwkjPXKqpjTlrpoPJdjFfXO5LiJjRkKPf
 4thTXcnnlYTqgco7GJlhXD2/ZAZiKaAX4/JqPuwdOAX71SVq8NYMVQZzqT04Gbnv
 yZXeQQRv2MvexS6Oqx6A5vYNK+sx2sDmRor1gCg8H4NHeAcD3+vlkedtB8kekf2p
 7dDygernGqWrcLxHnRbC7nTDsOpMcAlU/ylGogXS3r2hXF0i+ilQn7AvYxZCTqC0
 ePv4RjjycVe1SwJzSgxu4N6l3G4BjAcInA6dqgXdv2yuv++OfKKIttO1lfRHSnZ3
 L0Vt0gU1/FTImQUoscQ8wmZZ6AspicJ6+k6OmuJC5F4CGAD+YzgirIbVUkIaFCkT
 uo4DrG+9jLEjmDeQ6eZdytEOXxi2EL+/90V4tEIUtkDii8HlojHZp9IUi7+gJuGQ
 8Nram35o9u3+EcWPCWKKR9m/wzvhc8zJCLNChJuCXswGyNAGdH5c3TPEomuaj311
 LRpy4Jdo0I+aOLa1Os5zhiZwjD0atzHBVVDSJefh+Tw3M3/+gouMk6oNXrlS5p8R
 LX45i1iEUzCQLqam7NuTkt8tGX4J+auEOYx4/we7tZjVfPxg5+ykpwEsEgWcyehQ
 +L7+j0XXgGj1KvolHErRx18AqeK4r3FKDY1ceiHl6SK28VLrv4I=
 =odtP
 -----END PGP SIGNATURE-----

Merge tag 'm68knommu-for-v5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu mm fixes from Greg Ungerer:
 "Two critical mm related fixes that affect booting of m68k/ColdFire
  devices.

  Both fix problems caused by recent system init memblock changes"

* tag 'm68knommu-for-v5.8-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
  m68k: mm: fix node memblock init
  m68k: nommu: register start of the memory with memblock
This commit is contained in:
Linus Torvalds 2020-07-02 22:56:29 -07:00
commit cdd3bb5433
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arch/m68k/kernel/setup_no.c
View File

@ -138,7 +138,8 @@ void __init setup_arch(char **cmdline_p)
pr_debug("MEMORY -> ROMFS=0x%p-0x%06lx MEM=0x%06lx-0x%06lx\n ",
__bss_stop, memory_start, memory_start, memory_end);
memblock_add(memory_start, memory_end - memory_start);
memblock_add(_rambase, memory_end - _rambase);
memblock_reserve(_rambase, memory_start - _rambase);
/* Keep a copy of command line */
*cmdline_p = &command_line[0];

2
arch/m68k/mm/mcfmmu.c
View File

@ -174,7 +174,7 @@ void __init cf_bootmem_alloc(void)
m68k_memory[0].addr = _rambase;
m68k_memory[0].size = _ramend - _rambase;
memblock_add(m68k_memory[0].addr, m68k_memory[0].size);
memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0);
/* compute total pages in system */
num_pages = PFN_DOWN(_ramend - _rambase);