vserver 1.9.3

[linux-2.6.git] / arch / alpha / kernel / smp.c

diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index 3a4c9d6..6d4d09c 100644 (file)
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -25,6 +25,7 @@
 #include <linux/spinlock.h>
 #include <linux/irq.h>
 #include <linux/cache.h>
+#include <linux/profile.h>
 
 #include <asm/hwrpb.h>
 #include <asm/ptrace.h>
@@ -35,7 +36,6 @@
 #include <asm/bitops.h>
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
-#include <asm/hardirq.h>
 #include <asm/mmu_context.h>
 #include <asm/tlbflush.h>
 
@@ -411,15 +411,6 @@ secondary_cpu_start(int cpuid, struct task_struct *idle)
        return 0;
 }
 
-static struct task_struct * __init
-fork_by_hand(void)
-{
-       /* Don't care about the contents of regs since we'll never
-          reschedule the forked task. */
-       struct pt_regs regs;
-       return copy_process(CLONE_VM|CLONE_IDLETASK, 0, &regs, 0, NULL, NULL);
-}
-
 /*
  * Bring one cpu online.
  */
@@ -435,15 +426,10 @@ smp_boot_one_cpu(int cpuid)
           the other task-y sort of data structures set up like we
           wish.  We can't use kernel_thread since we must avoid
           rescheduling the child.  */
-       idle = fork_by_hand();
+       idle = fork_idle(cpuid);
        if (IS_ERR(idle))
                panic("failed fork for CPU %d", cpuid);
 
-       wake_up_forked_process(idle);
-
-       init_idle(idle, cpuid);
-       unhash_process(idle);
-
        DBGS(("smp_boot_one_cpu: CPU %d state 0x%lx flags 0x%lx\n",
              cpuid, idle->state, idle->flags));
 
@@ -613,8 +599,7 @@ smp_percpu_timer_interrupt(struct pt_regs *regs)
        struct cpuinfo_alpha *data = &cpu_data[cpu];
 
        /* Record kernel PC.  */
-       if (!user)
-               alpha_do_profile(regs->pc);
+       profile_tick(CPU_PROFILING, regs);
 
        if (!--data->prof_counter) {
                /* We need to make like a normal interrupt -- otherwise