]> Pileus Git - ~andy/linux/commit
projects / ~andy / linux / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: fac515d) | patch
powerpc/booke64: Guard e6500 tlb handler with CONFIG_PPC_FSL_BOOK3E
authorScott Wood <scottwood@freescale.com>
Sat, 18 Jan 2014 00:36:38 +0000 (18:36 -0600)
committerScott Wood <scottwood@freescale.com>
Sat, 18 Jan 2014 00:43:14 +0000 (18:43 -0600)
commit9841c79c890cf7ef9ffa2c86c9924113c9a88244
tree956b78ba25f3a697e69e36178758c2e87a4592d6tree | snapshot
parentfac515db45207718168cb55ca4d0a390e43b61afcommit | 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>
arch/powerpc/Kconfig diff | blob | history
arch/powerpc/mm/tlb_low_64e.S diff | blob | history
arch/powerpc/mm/tlb_nohash.c diff | blob | history
Andy's Linux Kernel repo