From: Scott Wood <scottwood@freescale.com>
Date: Sat, 18 Jan 2014 00:36:38 +0000 (-0600)
Subject: powerpc/booke64: Guard e6500 tlb handler with CONFIG_PPC_FSL_BOOK3E
X-Git-Tag: v3.14-rc1~39^2~15^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9841c79c890cf7ef9ffa2c86c9924113c9a88244;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed