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

Commit da8dbb88 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc 

* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/mm: Fix _PAGE_COHERENT support on classic ppc32 HW
parents 1385a7ae f99fb8a2

arch/powerpc/mm/hash_low_32.S

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ _GLOBAL(create_hpte) 
	and	r8,r8,r0		/* writable if _RW & _DIRTY */

	rlwimi	r5,r5,32-1,30,30	/* _PAGE_USER -> PP msb */

	rlwimi	r5,r5,32-2,31,31	/* _PAGE_USER -> PP lsb */

	ori	r8,r8,0xe14		/* clear out reserved bits and M */

	ori	r8,r8,0xe04		/* clear out reserved bits */

	andc	r8,r5,r8		/* PP = user? (rw&dirty? 2: 3): 0 */

BEGIN_FTR_SECTION

	rlwinm	r8,r8,0,~_PAGE_COHERENT	/* clear M (coherence not required) */