[PATCH 1/2] powerpc/mm/book3s/radix: Drop the unnecessary retry when creating linear mapping

[Aneesh Kumar K.V]

Checking for mapping_size != PAGE_SIZE should make sure we handle the
split_text_mapping correctly. Drop the retry loop.

Signed-off-by: Aneesh Kumar K.V <aneesh.ku...@linux.ibm.com>
---
 arch/powerpc/mm/pgtable-radix.c | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/arch/powerpc/mm/pgtable-radix.c b/arch/powerpc/mm/pgtable-radix.c
index bba168d02235..d9819e573103 100644
--- a/arch/powerpc/mm/pgtable-radix.c
+++ b/arch/powerpc/mm/pgtable-radix.c
@@ -261,7 +261,6 @@ static int __meminit create_physical_mapping(unsigned long 
start,
 {
        unsigned long vaddr, addr, mapping_size = 0;
        pgprot_t prot;
-       unsigned long max_mapping_size;
 #ifdef CONFIG_STRICT_KERNEL_RWX
        int split_text_mapping = 1;
 #else
@@ -275,12 +274,9 @@ static int __meminit create_physical_mapping(unsigned long 
start,
 
                gap = end - addr;
                previous_size = mapping_size;
-               max_mapping_size = PUD_SIZE;
 
-retry:
                if (IS_ALIGNED(addr, PUD_SIZE) && gap >= PUD_SIZE &&
-                   mmu_psize_defs[MMU_PAGE_1G].shift &&
-                   PUD_SIZE <= max_mapping_size)
+                   mmu_psize_defs[MMU_PAGE_1G].shift)
                        mapping_size = PUD_SIZE;
                else if (IS_ALIGNED(addr, PMD_SIZE) && gap >= PMD_SIZE &&
                         mmu_psize_defs[MMU_PAGE_2M].shift)
@@ -288,14 +284,7 @@ static int __meminit create_physical_mapping(unsigned long 
start,
                else
                        mapping_size = PAGE_SIZE;
 
-               if (split_text_mapping && (mapping_size == PUD_SIZE) &&
-                       (addr <= __pa_symbol(__init_begin)) &&
-                       (addr + mapping_size) >= __pa_symbol(_stext)) {
-                       max_mapping_size = PMD_SIZE;
-                       goto retry;
-               }
-
-               if (split_text_mapping && (mapping_size == PMD_SIZE) &&
+               if (split_text_mapping && (mapping_size != PAGE_SIZE) &&
                    (addr <= __pa_symbol(__init_begin)) &&
                    (addr + mapping_size) >= __pa_symbol(_stext))
                        mapping_size = PAGE_SIZE;
-- 
2.17.1