powerpc/pseries: Factor out DTL buffer allocation and registration routines

[linux-2.6-block.git] / arch / powerpc / platforms / pseries / setup.c

diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index e2cb29e96fa425f1e13436bc3cc7b90c0b64439b..9d106494cc2df5d57a849cae92f718112daf0f0f 100644 (file)
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -279,46 +279,16 @@ struct kmem_cache *dtl_cache;
  */
 static int alloc_dispatch_logs(void)
 {
-       int cpu, ret;
-       struct paca_struct *pp;
-       struct dtl_entry *dtl;
-
        if (!firmware_has_feature(FW_FEATURE_SPLPAR))
                return 0;
 
        if (!dtl_cache)
                return 0;
 
-       for_each_possible_cpu(cpu) {
-               pp = paca_ptrs[cpu];
-               dtl = kmem_cache_alloc(dtl_cache, GFP_KERNEL);
-               if (!dtl) {
-                       pr_warn("Failed to allocate dispatch trace log for cpu %d\n",
-                               cpu);
-                       pr_warn("Stolen time statistics will be unreliable\n");
-                       break;
-               }
-
-               pp->dtl_ridx = 0;
-               pp->dispatch_log = dtl;
-               pp->dispatch_log_end = dtl + N_DISPATCH_LOG;
-               pp->dtl_curr = dtl;
-       }
+       alloc_dtl_buffers();
 
        /* Register the DTL for the current (boot) cpu */
-       dtl = get_paca()->dispatch_log;
-       get_paca()->dtl_ridx = 0;
-       get_paca()->dtl_curr = dtl;
-       get_paca()->lppaca_ptr->dtl_idx = 0;
-
-       /* hypervisor reads buffer length from this field */
-       dtl->enqueue_to_dispatch_time = cpu_to_be32(DISPATCH_LOG_BYTES);
-       ret = register_dtl(hard_smp_processor_id(), __pa(dtl));
-       if (ret)
-               pr_err("WARNING: DTL registration of cpu %d (hw %d) failed "
-                      "with %d\n", smp_processor_id(),
-                      hard_smp_processor_id(), ret);
-       get_paca()->lppaca_ptr->dtl_enable_mask = DTL_LOG_PREEMPT;
+       register_dtl_buffer(smp_processor_id());
 
        return 0;
 }