diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 11:21:11 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-11 11:21:11 -0500 |
| commit | da8dbb88db2af1e963090bd549a9a7dccffe991c (patch) | |
| tree | 3d4be20db11a546c59f78cef8a6962cc0c7d13ed | |
| parent | 1385a7ae654264fb2d9d3c6c3c7a3df28d29ab53 (diff) | |
| parent | f99fb8a2cbf0fd9ce9b2d5d298943d0d4dc479f7 (diff) | |
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
| -rw-r--r-- | arch/powerpc/mm/hash_low_32.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/hash_low_32.S b/arch/powerpc/mm/hash_low_32.S index 67850ec9feb3..14af8cedab70 100644 --- a/arch/powerpc/mm/hash_low_32.S +++ b/arch/powerpc/mm/hash_low_32.S | |||
| @@ -320,7 +320,7 @@ _GLOBAL(create_hpte) | |||
| 320 | and r8,r8,r0 /* writable if _RW & _DIRTY */ | 320 | and r8,r8,r0 /* writable if _RW & _DIRTY */ |
| 321 | rlwimi r5,r5,32-1,30,30 /* _PAGE_USER -> PP msb */ | 321 | rlwimi r5,r5,32-1,30,30 /* _PAGE_USER -> PP msb */ |
| 322 | rlwimi r5,r5,32-2,31,31 /* _PAGE_USER -> PP lsb */ | 322 | rlwimi r5,r5,32-2,31,31 /* _PAGE_USER -> PP lsb */ |
| 323 | ori r8,r8,0xe14 /* clear out reserved bits and M */ | 323 | ori r8,r8,0xe04 /* clear out reserved bits */ |
| 324 | andc r8,r5,r8 /* PP = user? (rw&dirty? 2: 3): 0 */ | 324 | andc r8,r5,r8 /* PP = user? (rw&dirty? 2: 3): 0 */ |
| 325 | BEGIN_FTR_SECTION | 325 | BEGIN_FTR_SECTION |
| 326 | rlwinm r8,r8,0,~_PAGE_COHERENT /* clear M (coherence not required) */ | 326 | rlwinm r8,r8,0,~_PAGE_COHERENT /* clear M (coherence not required) */ |