浏览代码

[PATCH] ppc: Fix ppc32 build after 64K pages

Oops, some last minute changes caused the 64K pages patch to break ppc32
build, this fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Benjamin Herrenschmidt 19 年之前
父节点
当前提交
863c84b97c
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      arch/powerpc/Kconfig
  2. 2 2
      arch/powerpc/mm/ppc_mmu_32.c

+ 1 - 0
arch/powerpc/Kconfig

@@ -605,6 +605,7 @@ config NODES_SPAN_OTHER_NODES
 
 
 config PPC_64K_PAGES
 config PPC_64K_PAGES
 	bool "64k page size"
 	bool "64k page size"
+	depends on PPC64
 	help
 	help
 	  This option changes the kernel logical page size to 64k. On machines
 	  This option changes the kernel logical page size to 64k. On machines
           without processor support for 64k pages, the kernel will simulate
           without processor support for 64k pages, the kernel will simulate

+ 2 - 2
arch/powerpc/mm/ppc_mmu_32.c

@@ -188,9 +188,9 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,
 
 
 	if (Hash == 0)
 	if (Hash == 0)
 		return;
 		return;
-	pmd = pmd_offset(pgd_offset(vma->vm_mm, address), address);
+	pmd = pmd_offset(pgd_offset(mm, ea), ea);
 	if (!pmd_none(*pmd))
 	if (!pmd_none(*pmd))
-		add_hash_page(vma->vm_mm->context, address, pmd_val(*pmd));
+		add_hash_page(mm->context, ea, pmd_val(*pmd));
 }
 }
 
 
 /*
 /*