1 files changed, 8 insertions, 1 deletions

diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index ed0aab0208a6..f1c2d55b4377 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -736,14 +736,21 @@ static int __init hugetlbpage_init(void)
 
         if (!cpu_has_feature(CPU_FTR_16M_PAGE))
                 return -ENODEV;
+
         /* Add supported huge page sizes.  Need to change HUGE_MAX_HSTATE
          * and adjust PTE_NONCACHE_NUM if the number of supported huge page
          * sizes changes.
          */
         set_huge_psize(MMU_PAGE_16M);
-        set_huge_psize(MMU_PAGE_64K);
         set_huge_psize(MMU_PAGE_16G);
 
+        /* Temporarily disable support for 64K huge pages when 64K SPU local
+         * store support is enabled as the current implementation conflicts.
+         */
+#ifndef CONFIG_SPU_FS_64K_LS
+        set_huge_psize(MMU_PAGE_64K);
+#endif
+
         for (psize = 0; psize < MMU_PAGE_COUNT; ++psize) {
                 if (mmu_huge_psizes[psize]) {
                         huge_pgtable_cache(psize) = kmem_cache_create(