Merge tag 'nommu-for-rmk' of git://git.pengutronix.de/git/ukl/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 1 Aug 2014 18:54:26 +0000 (19:54 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 1 Aug 2014 18:54:26 +0000 (19:54 +0100)
commitc70fbb01b11cecfa13d9e746f462617d3ac0e38c
tree1946cf555bee185ac81dc0127c6e067040681469
parent4b2974fa6a4a32d390a50e23381a2270a2e0d444
parent83de911cf897a4317147dd9cb379378c2c4abf4c
Merge tag 'nommu-for-rmk' of git://git.pengutronix.de/git/ukl/linux into devel-stable

Two different fixes for the same problem making some ARM nommu configurations
not boot since 3.6-rc1. The problem is that user_addr_max returned the biggest
available RAM address which makes some copy_from_user variants fail to read
from XIP memory.

Even in the presence of one of the two fixes the other still makes sense, so
both patches are included here.

This problem was the last one preventing efm32 boot to a prompt with mainline.