git://ftp.safe.ca / safe / jmp / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 9c3d936) | patch
sh: Do not try merging two 128MB PMB mappings
authorMatt Fleming <matt@console-pimps.org>
Sun, 25 Apr 2010 16:29:07 +0000 (17:29 +0100)
committerMatt Fleming <matt@console-pimps.org>
Sun, 25 Apr 2010 19:44:23 +0000 (20:44 +0100)
commitc7b03fa0bdc04e00bfbdc4cc69da144b11108f37
tree1dab19213c06e87818faef6badd7eb101877be2etree | snapshot
parent9c3d936352fefaadec57bafda1fe3807890cbf2ccommit | diff
sh: Do not try merging two 128MB PMB mappings

There is a logic error in pmb_merge() that means we will incorrectly try
to merge two 128MB PMB mappings into one mapping. However, 256MB isn't a
valid PMB map size and pmb_merge() will actually drop the second 128MB
mapping.

This patch allows my SDK7786 board to boot when configured with
CONFIG_MEMORY_SIZE=0x10000000.

Signed-off-by: Matt Fleming <matt@console-pimps.org>
arch/sh/mm/pmb.c diff | blob | history
Full containers within linux kernel