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."
这个提交包含在:
@@ -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.
|
||||
|
在新工单中引用
屏蔽一个用户