powerpc/64s: Move hash MMU support code under CONFIG_PPC_64S_HASH_MMU

[linux-2.6-block.git] / arch / powerpc / mm / book3s64 / mmu_context.c

diff --git a/arch/powerpc/mm/book3s64/mmu_context.c b/arch/powerpc/mm/book3s64/mmu_context.c
index c10fc8a72fb37aed5c93a3edd095e4b3d70739da..24aa953c931148bad7f1f059ae5de94399f3a7fc 100644 (file)
--- a/arch/powerpc/mm/book3s64/mmu_context.c
+++ b/arch/powerpc/mm/book3s64/mmu_context.c
@@ -31,6 +31,7 @@ static int alloc_context_id(int min_id, int max_id)
        return ida_alloc_range(&mmu_context_ida, min_id, max_id, GFP_KERNEL);
 }
 
+#ifdef CONFIG_PPC_64S_HASH_MMU
 void hash__reserve_context_id(int id)
 {
        int result = ida_alloc_range(&mmu_context_ida, id, id, GFP_KERNEL);
@@ -50,7 +51,9 @@ int hash__alloc_context_id(void)
        return alloc_context_id(MIN_USER_CONTEXT, max);
 }
 EXPORT_SYMBOL_GPL(hash__alloc_context_id);
+#endif
 
+#ifdef CONFIG_PPC_64S_HASH_MMU
 static int realloc_context_ids(mm_context_t *ctx)
 {
        int i, id;
@@ -150,6 +153,13 @@ void hash__setup_new_exec(void)
 
        slb_setup_new_exec();
 }
+#else
+static inline int hash__init_new_context(struct mm_struct *mm)
+{
+       BUILD_BUG();
+       return 0;
+}
+#endif
 
 static int radix__init_new_context(struct mm_struct *mm)
 {
@@ -175,7 +185,9 @@ static int radix__init_new_context(struct mm_struct *mm)
         */
        asm volatile("ptesync;isync" : : : "memory");
 
+#ifdef CONFIG_PPC_64S_HASH_MMU
        mm->context.hash_context = NULL;
+#endif
 
        return index;
 }
@@ -213,14 +225,22 @@ EXPORT_SYMBOL_GPL(__destroy_context);
 
 static void destroy_contexts(mm_context_t *ctx)
 {
-       int index, context_id;
+       if (radix_enabled()) {
+               ida_free(&mmu_context_ida, ctx->id);
+       } else {
+#ifdef CONFIG_PPC_64S_HASH_MMU
+               int index, context_id;
 
-       for (index = 0; index < ARRAY_SIZE(ctx->extended_id); index++) {
-               context_id = ctx->extended_id[index];
-               if (context_id)
-                       ida_free(&mmu_context_ida, context_id);
+               for (index = 0; index < ARRAY_SIZE(ctx->extended_id); index++) {
+                       context_id = ctx->extended_id[index];
+                       if (context_id)
+                               ida_free(&mmu_context_ida, context_id);
+               }
+               kfree(ctx->hash_context);
+#else
+               BUILD_BUG(); // radix_enabled() should be constant true
+#endif
        }
-       kfree(ctx->hash_context);
 }
 
 static void pmd_frag_destroy(void *pmd_frag)