From: Matt Fleming Date: Sun, 25 Apr 2010 16:29:07 +0000 (+0100) Subject: sh: Do not try merging two 128MB PMB mappings X-Git-Tag: v2.6.35-rc1~504^2~26^2~1 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7b03fa0bdc04e00bfbdc4cc69da144b11108f37;p=pandora-kernel.git 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 --- Reading git-diff-tree failed