diff options
author | Becky Bruce <beckyb@kernel.crashing.org> | 2011-10-10 06:50:40 -0400 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-07 00:26:22 -0500 |
commit | 881fde1db591628db0494e77cd9002b0ba8b04b7 (patch) | |
tree | 0281839c8a9d248236645f07bcb4dcd45e6ed992 /arch/powerpc/mm/tlb_nohash.c | |
parent | a1cd54198811e3c35fcaabdb94767b307f7ad1db (diff) |
powerpc: hugetlb: modify include usage for FSL BookE code
The original 32-bit hugetlb implementation used PPC64 vs PPC32 to
determine which code path to take. However, the final hugetlb
implementation for 64-bit FSL ended up shared with the FSL
32-bit code so the actual check needs to be FSL_BOOK3E vs
everything else. This patch changes the include protections to
reflect this.
There are also a couple of related comment fixes.
Signed-off-by: Becky Bruce <beckyb@kernel.crashing.org>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/mm/tlb_nohash.c')
-rw-r--r-- | arch/powerpc/mm/tlb_nohash.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/tlb_nohash.c b/arch/powerpc/mm/tlb_nohash.c index 4e13d6f9023e..b2c65c660852 100644 --- a/arch/powerpc/mm/tlb_nohash.c +++ b/arch/powerpc/mm/tlb_nohash.c | |||
@@ -52,7 +52,7 @@ | |||
52 | * indirect page table entries. | 52 | * indirect page table entries. |
53 | */ | 53 | */ |
54 | #ifdef CONFIG_PPC_BOOK3E_MMU | 54 | #ifdef CONFIG_PPC_BOOK3E_MMU |
55 | #ifdef CONFIG_FSL_BOOKE | 55 | #ifdef CONFIG_PPC_FSL_BOOK3E |
56 | struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = { | 56 | struct mmu_psize_def mmu_psize_defs[MMU_PAGE_COUNT] = { |
57 | [MMU_PAGE_4K] = { | 57 | [MMU_PAGE_4K] = { |
58 | .shift = 12, | 58 | .shift = 12, |