Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 863c84b9 authored Nov 07, 2005 by Benjamin Herrenschmidt Committed by Linus Torvalds Nov 07, 2005

[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>

parent c8e3c8b2

arch/powerpc/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -605,6 +605,7 @@ config NODES_SPAN_OTHER_NODES

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

arch/powerpc/mm/ppc_mmu_32.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -188,9 +188,9 @@ void hash_preload(struct mm_struct *mm, unsigned long ea,

		if (Hash == 0)
		return;
		pmd = pmd_offset(pgd_offset(vma->vm_mm, address), address);
		pmd = pmd_offset(pgd_offset(mm, ea), ea);
		if (!pmd_none(*pmd))
		add_hash_page(vma->vm_mm->context, address, pmd_val(*pmd));
		add_hash_page(mm->context, ea, pmd_val(*pmd));
		}

		/*