| commit | 9841c79c890cf7ef9ffa2c86c9924113c9a88244 | [log] [tgz] |
|---|---|---|
| author | Scott Wood <scottwood@freescale.com> | Fri Jan 17 18:36:38 2014 -0600 |
| committer | Scott Wood <scottwood@freescale.com> | Fri Jan 17 18:43:14 2014 -0600 |
| tree | 956b78ba25f3a697e69e36178758c2e87a4592d6 | |
| parent | fac515db45207718168cb55ca4d0a390e43b61af [diff] |
powerpc/booke64: Guard e6500 tlb handler with CONFIG_PPC_FSL_BOOK3E
...and make CONFIG_PPC_FSL_BOOK3E conflict with CONFIG_PPC_64K_PAGES.
This fixes a build break with CONFIG_PPC_64K_PAGES on 64-bit book3e,
that was introduced by commit 28efc35fe68dacbddc4b12c2fa8f2df1593a4ad3
("powerpc/e6500: TLB miss handler with hardware tablewalk support").
Signed-off-by: Scott Wood <scottwood@freescale.com>