diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-01-18 01:36:38 +0100 |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-01-18 01:43:14 +0100 |
| commit | 9841c79c890cf7ef9ffa2c86c9924113c9a88244 (patch) | |
| tree | 956b78ba25f3a697e69e36178758c2e87a4592d6 /arch/powerpc/mm/tlb_low_64e.S | |
| parent | Merge remote-tracking branch 'scott/next' into next (diff) | |
| download | linux-9841c79c890cf7ef9ffa2c86c9924113c9a88244.tar.xz linux-9841c79c890cf7ef9ffa2c86c9924113c9a88244.zip | |
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/mm/tlb_low_64e.S')
| -rw-r--r-- | arch/powerpc/mm/tlb_low_64e.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/powerpc/mm/tlb_low_64e.S b/arch/powerpc/mm/tlb_low_64e.S index 16250b162375..c95eb323e9ae 100644 --- a/arch/powerpc/mm/tlb_low_64e.S +++ b/arch/powerpc/mm/tlb_low_64e.S @@ -240,6 +240,7 @@ itlb_miss_fault_bolted: beq tlb_miss_common_bolted b itlb_miss_kernel_bolted +#ifdef CONFIG_PPC_FSL_BOOK3E /* * TLB miss handling for e6500 and derivatives, using hardware tablewalk. * @@ -409,7 +410,7 @@ itlb_miss_fault_e6500: TLB_MISS_STATS_I(MMSTAT_TLB_MISS_NORM_FAULT) tlb_epilog_bolted b exc_instruction_storage_book3e - +#endif /* CONFIG_PPC_FSL_BOOK3E */ /********************************************************************** * * |