mm/cma: Cleanup highmem check
authorLaura Abbott <labbott@redhat.com>
Tue, 10 Jan 2017 21:35:41 +0000 (13:35 -0800)
committerWill Deacon <will.deacon@arm.com>
Wed, 11 Jan 2017 13:56:49 +0000 (13:56 +0000)
commit2dece445b6dbdaa3d94f38ef44aa1b63bc2a6bb9
treeec3a9b45f2541d3b7e0e371b73add340dbeae0ea
parentfa5b6ec9e5274aeae2326e25995506a953e5f878
mm/cma: Cleanup highmem check

6b101e2a3ce4 ("mm/CMA: fix boot regression due to physical address of
high_memory") added checks to use __pa_nodebug on x86 since
CONFIG_DEBUG_VIRTUAL complains about high_memory not being linearlly
mapped. arm64 is now getting support for CONFIG_DEBUG_VIRTUAL as well.
Rather than add an explosion of arches to the #ifdef, switch to an
alternate method to calculate the physical start of highmem using
the page before highmem starts. This avoids the need for the #ifdef and
extra __pa_nodebug calls.

Reviewed-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
mm/cma.c