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

Commit f1a1eb29 authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[POWERPC] Further fixes for the removal of 4level-fixup hack from ppc32 



Commit d1953c88 removed the use of
4level-fixup.h for 32-bit systems under arch/powerpc.  However, I
missed a few things activated on some configurations, resulting in
some warnings (at least with STRICT_MM_TYPECHECKS enabled) and build
errors in some circumstances.  This fixes it.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent fcf9892b

arch/powerpc/mm/ppc_mmu_32.c

+1 −1
Original line number Diff line number Diff line
@@ -185,7 +185,7 @@ void hash_preload(struct mm_struct *mm, unsigned long ea, 


	if (Hash == 0)

		return;

	pmd = pmd_offset(pgd_offset(mm, ea), ea);

	pmd = pmd_offset(pud_offset(pgd_offset(mm, ea), ea), ea);

	if (!pmd_none(*pmd))

		add_hash_page(mm->context.id, ea, pmd_val(*pmd));

}

arch/powerpc/mm/tlb_32.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ static void flush_range(struct mm_struct *mm, unsigned long start, 
	if (start >= end)

		return;

	end = (end - 1) | ~PAGE_MASK;

	pmd = pmd_offset(pgd_offset(mm, start), start);

	pmd = pmd_offset(pud_offset(pgd_offset(mm, start), start), start);

	for (;;) {

		pmd_end = ((start + PGDIR_SIZE) & PGDIR_MASK) - 1;

		if (pmd_end > end)
@@ -169,7 +169,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long vmaddr) 
		return;

	}

	mm = (vmaddr < TASK_SIZE)? vma->vm_mm: &init_mm;

	pmd = pmd_offset(pgd_offset(mm, vmaddr), vmaddr);

	pmd = pmd_offset(pud_offset(pgd_offset(mm, vmaddr), vmaddr), vmaddr);

	if (!pmd_none(*pmd))

		flush_hash_pages(mm->context.id, vmaddr, pmd_val(*pmd), 1);

	FINISH_FLUSH;

arch/powerpc/platforms/86xx/mpc86xx_smp.c

+1 −1
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
#include <linux/init.h>

#include <linux/delay.h>



#include <asm/pgtable.h>

#include <asm/page.h>

#include <asm/pgtable.h>

#include <asm/pci-bridge.h>

#include <asm-powerpc/mpic.h>

#include <asm/mpc86xx.h>