diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-18 16:58:15 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2014-11-18 17:00:38 +1100 |
| commit | 35891d40bfc4f41fc627abb757c0894c0028f3ab (patch) | |
| tree | beabb57ce8423538cd534a774fb5c0f8a3a8ec74 /arch/powerpc/mm | |
| parent | 80fa93fce37d3490f4bb0da8a5b239a6745bc744 (diff) | |
| parent | 76f3e2929bb6b476fb02b519ad953e2e29ee7bd5 (diff) | |
| download | linux-35891d40bfc4f41fc627abb757c0894c0028f3ab.tar.bz2 | |
Merge remote-tracking branch 'scottwood/next' into next
Scott says:
"Highlights include a bunch of 8xx optimizations, device tree bindings
for Freescale BMan, QMan, and FMan datapath components, misc device tree
updates, and inbound rio window support."
Diffstat (limited to 'arch/powerpc/mm')
| -rw-r--r-- | arch/powerpc/mm/fault.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c index 08d659a9fcdb..eb79907f34fa 100644 --- a/arch/powerpc/mm/fault.c +++ b/arch/powerpc/mm/fault.c @@ -43,7 +43,6 @@ #include <asm/tlbflush.h> #include <asm/siginfo.h> #include <asm/debug.h> -#include <mm/mmu_decl.h> #include "icswx.h" @@ -380,12 +379,6 @@ good_area: goto bad_area; #endif /* CONFIG_6xx */ #if defined(CONFIG_8xx) - /* 8xx sometimes need to load a invalid/non-present TLBs. - * These must be invalidated separately as linux mm don't. - */ - if (error_code & 0x40000000) /* no translation? */ - _tlbil_va(address, 0, 0, 0); - /* The MPC8xx seems to always set 0x80000000, which is * "undefined". Of those that can be set, this is the only * one which seems bad. |