diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-15 19:24:25 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-15 19:24:25 -0500 |
| commit | 1e7342e7789fa2ca9202701467428726cbcfd649 (patch) | |
| tree | e0ad000924e9875bd2ea17bd0e04382491765a09 /arch/powerpc/mm | |
| parent | 78c5c68a4cf4329d17abfa469345ddf323d4fd62 (diff) | |
| parent | 228d55053397e6d5325ca179c7ffe331de2846d3 (diff) | |
Merge remote-tracking branch 'jwb/next' into next
Conflicts:
arch/powerpc/platforms/40x/ppc40x_simple.c
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/44x_mmu.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/powerpc/mm/44x_mmu.c b/arch/powerpc/mm/44x_mmu.c index f60e006d90c3..5d4e3fff6d6d 100644 --- a/arch/powerpc/mm/44x_mmu.c +++ b/arch/powerpc/mm/44x_mmu.c | |||
| @@ -78,11 +78,7 @@ static void __init ppc44x_pin_tlb(unsigned int virt, unsigned int phys) | |||
| 78 | "tlbwe %1,%3,%5\n" | 78 | "tlbwe %1,%3,%5\n" |
| 79 | "tlbwe %0,%3,%6\n" | 79 | "tlbwe %0,%3,%6\n" |
| 80 | : | 80 | : |
| 81 | #ifdef CONFIG_PPC47x | ||
| 82 | : "r" (PPC47x_TLB2_S_RWX), | ||
| 83 | #else | ||
| 84 | : "r" (PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_SX | PPC44x_TLB_G), | 81 | : "r" (PPC44x_TLB_SW | PPC44x_TLB_SR | PPC44x_TLB_SX | PPC44x_TLB_G), |
| 85 | #endif | ||
| 86 | "r" (phys), | 82 | "r" (phys), |
| 87 | "r" (virt | PPC44x_TLB_VALID | PPC44x_TLB_256M), | 83 | "r" (virt | PPC44x_TLB_VALID | PPC44x_TLB_256M), |
| 88 | "r" (entry), | 84 | "r" (entry), |