3.16.51-rc1 review patch. If anyone has any objections, please let me know.
------------------
From: "Aneesh Kumar K.V" aneesh.kumar@linux.vnet.ibm.com
commit 7e7dc66adcf490a619bc3c7763a8cebadfba73e3 upstream.
We can use pfn_to_page() in realmode for other configs. Hence remove the CONFIG_FLATMEM ifdef.
Fixes: 8e0861fa3c4e ("powerpc: Prepare to support kernel handling of IOMMU map/unmap") Cc: Alexey Kardashevskiy aik@ozlabs.ru Signed-off-by: Aneesh Kumar K.V aneesh.kumar@linux.vnet.ibm.com [mpe: Also fix up the #endif comment] Signed-off-by: Michael Ellerman mpe@ellerman.id.au [bwh: Backported to 3.16: adjust context] Signed-off-by: Ben Hutchings ben@decadent.org.uk --- arch/powerpc/mm/init_64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
--- a/arch/powerpc/mm/init_64.c +++ b/arch/powerpc/mm/init_64.c @@ -345,7 +345,7 @@ struct page *realmode_pfn_to_page(unsign } EXPORT_SYMBOL_GPL(realmode_pfn_to_page);
-#elif defined(CONFIG_FLATMEM) +#else
struct page *realmode_pfn_to_page(unsigned long pfn) { @@ -354,4 +354,4 @@ struct page *realmode_pfn_to_page(unsign } EXPORT_SYMBOL_GPL(realmode_pfn_to_page);
-#endif /* CONFIG_SPARSEMEM_VMEMMAP/CONFIG_FLATMEM */ +#endif /* CONFIG_SPARSEMEM_VMEMMAP */