diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-08-15 02:51:18 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-08-16 21:01:59 -0400 |
commit | e8ff0646e5df850ff084be9c97a2e69fff5697b4 (patch) | |
tree | 42a5630bb518337e16d016aacdd783b39fce6122 /arch/powerpc/mm/hash_utils_64.c | |
parent | 0b8188a44def37f4f8ef01653da199ca3a3e0a2a (diff) |
[POWERPC] Tidy up CONFIG_PPC_MM_SLICES code
This removes some of the #ifdefs from .c files.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/mm/hash_utils_64.c')
-rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index c74af42eb9c1..d525f2eba313 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c | |||
@@ -601,13 +601,7 @@ static void demote_segment_4k(struct mm_struct *mm, unsigned long addr) | |||
601 | { | 601 | { |
602 | if (mm->context.user_psize == MMU_PAGE_4K) | 602 | if (mm->context.user_psize == MMU_PAGE_4K) |
603 | return; | 603 | return; |
604 | #ifdef CONFIG_PPC_MM_SLICES | ||
605 | slice_set_user_psize(mm, MMU_PAGE_4K); | 604 | slice_set_user_psize(mm, MMU_PAGE_4K); |
606 | #else /* CONFIG_PPC_MM_SLICES */ | ||
607 | mm->context.user_psize = MMU_PAGE_4K; | ||
608 | mm->context.sllp = SLB_VSID_USER | mmu_psize_defs[MMU_PAGE_4K].sllp; | ||
609 | #endif /* CONFIG_PPC_MM_SLICES */ | ||
610 | |||
611 | #ifdef CONFIG_SPU_BASE | 605 | #ifdef CONFIG_SPU_BASE |
612 | spu_flush_all_slbs(mm); | 606 | spu_flush_all_slbs(mm); |
613 | #endif | 607 | #endif |