]> git.baikalelectronics.ru Git - kernel.git/commitdiff
powerpc/mm: Build fix for non SPARSEMEM_VMEMAP config
authorAneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Wed, 28 Jun 2017 06:09:28 +0000 (11:39 +0530)
committerMichael Ellerman <mpe@ellerman.id.au>
Mon, 24 Jul 2017 12:39:08 +0000 (22:39 +1000)
We can use pfn_to_page() in realmode for other configs. Hence remove the
CONFIG_FLATMEM ifdef.

Fixes: affdea39f9d8 ("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>
arch/powerpc/mm/init_64.c

index 5b4c25d12ff3564ed90628447c74c18ea570be86..b1c83a6bfd5438ce8a22e3335d9690798c73547d 100644 (file)
@@ -356,7 +356,7 @@ struct page *realmode_pfn_to_page(unsigned long pfn)
 }
 EXPORT_SYMBOL_GPL(realmode_pfn_to_page);
 
-#elif defined(CONFIG_FLATMEM)
+#else
 
 struct page *realmode_pfn_to_page(unsigned long pfn)
 {
@@ -365,7 +365,7 @@ struct page *realmode_pfn_to_page(unsigned long pfn)
 }
 EXPORT_SYMBOL_GPL(realmode_pfn_to_page);
 
-#endif /* CONFIG_SPARSEMEM_VMEMMAP/CONFIG_FLATMEM */
+#endif /* CONFIG_SPARSEMEM_VMEMMAP */
 
 #ifdef CONFIG_PPC_STD_MMU_64
 static bool disable_radix;