1 files changed, 3 insertions, 6 deletions

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 8a9a49c13865..f425b5b37d58 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -621,15 +621,12 @@ static int __init add_huge_page_size(unsigned long long size)
          * firmware we only add hugetlb support for page sizes that can be
          * supported by linux page table layout.
          * For now we have
-         * Radix: 2M
+         * Radix: 2M and 1G
          * Hash: 16M and 16G
          */
         if (radix_enabled()) {
-                if (mmu_psize != MMU_PAGE_2M) {
-                        if (cpu_has_feature(CPU_FTR_POWER9_DD1) ||
-                            (mmu_psize != MMU_PAGE_1G))
-                                return -EINVAL;
-                }
+                if (mmu_psize != MMU_PAGE_2M && mmu_psize != MMU_PAGE_1G)
+                        return -EINVAL;
         } else {
                 if (mmu_psize != MMU_PAGE_16M && mmu_psize != MMU_PAGE_16G)
                         return -EINVAL;