]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: edddc85) | 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)
commit455c52284c833605c4c7e1bdd0e5ba899afd325d
tree956b78ba25f3a697e69e36178758c2e87a4592d6tree | snapshot
parentedddc85ed67e05c42c49d7a776f86d25b88e0f7fcommit | 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 38ff8cde53901ef4106db276a7808976b9549266
("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
Linux Kernel Source Tree.