diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-01-17 19:36:38 -0500 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-01-17 19:43:14 -0500 |
| commit | 9841c79c890cf7ef9ffa2c86c9924113c9a88244 (patch) | |
| tree | 956b78ba25f3a697e69e36178758c2e87a4592d6 /arch/powerpc/Kconfig | |
| 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>
Diffstat (limited to 'arch/powerpc/Kconfig')
| -rw-r--r-- | arch/powerpc/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index fa395179ddd6..ad912d59313c 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig | |||
| @@ -526,6 +526,7 @@ config PPC_16K_PAGES | |||
| 526 | 526 | ||
| 527 | config PPC_64K_PAGES | 527 | config PPC_64K_PAGES |
| 528 | bool "64k page size" if 44x || PPC_STD_MMU_64 || PPC_BOOK3E_64 | 528 | bool "64k page size" if 44x || PPC_STD_MMU_64 || PPC_BOOK3E_64 |
| 529 | depends on !PPC_FSL_BOOK3E | ||
| 529 | select PPC_HAS_HASH_64K if PPC_STD_MMU_64 | 530 | select PPC_HAS_HASH_64K if PPC_STD_MMU_64 |
| 530 | 531 | ||
| 531 | config PPC_256K_PAGES | 532 | config PPC_256K_PAGES |