diff options
| author | Greg Ungerer <gerg@linux-m68k.org> | 2017-09-05 22:57:06 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-09 22:01:48 +0100 |
| commit | 510f6573ef5da5cc678e0fdb955f95c6125cd3bd (patch) | |
| tree | 541c496cc9fe98c3a65f979569b53fdb71dfa518 /arch/m68k | |
| parent | e5f2421df13523e46697d453575c020af57c945b (diff) | |
| download | linux-stable-510f6573ef5da5cc678e0fdb955f95c6125cd3bd.tar.gz linux-stable-510f6573ef5da5cc678e0fdb955f95c6125cd3bd.tar.bz2 linux-stable-510f6573ef5da5cc678e0fdb955f95c6125cd3bd.zip | |
m68k: fix ColdFire node shift size calculation
[ Upstream commit f55ab8f27548ff3431a6567d400c6757c49fd520 ]
The m68k pg_data_table is a fix size array defined in arch/m68k/mm/init.c.
Index numbers within it are defined based on memory size. But for Coldfire
these don't take into account a non-zero physical RAM base address, and this
causes us to access past the end of this array at system start time.
Change the node shift calculation so that we keep the index inside its range.
Reported-by: Angelo Dureghello <angelo@sysam.it>
Tested-by: Angelo Dureghello <angelo@sysam.it>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/m68k')
| -rw-r--r-- | arch/m68k/mm/mcfmmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c index 87131cd3bc8f..6d3a50446b21 100644 --- a/arch/m68k/mm/mcfmmu.c +++ b/arch/m68k/mm/mcfmmu.c @@ -169,7 +169,7 @@ void __init cf_bootmem_alloc(void) max_pfn = max_low_pfn = PFN_DOWN(_ramend); high_memory = (void *)_ramend; - m68k_virt_to_node_shift = fls(_ramend - _rambase - 1) - 6; + m68k_virt_to_node_shift = fls(_ramend - 1) - 6; module_fixup(NULL, __start_fixup, __stop_fixup); /* setup bootmem data */ |