vserver 1.9.5.x5

[linux-2.6.git] / arch / ia64 / kernel / process.c

diff --git a/arch/ia64/kernel/process.c b/arch/ia64/kernel/process.c
index 842c95b..9129338 100644 (file)
--- a/arch/ia64/kernel/process.c
+++ b/arch/ia64/kernel/process.c
@@ -25,6 +25,7 @@
 #include <linux/unistd.h>
 #include <linux/efi.h>
 #include <linux/interrupt.h>
+#include <linux/delay.h>
 
 #include <asm/cpu.h>
 #include <asm/delay.h>
@@ -39,6 +40,8 @@
 #include <asm/unwind.h>
 #include <asm/user.h>
 
+#include "entry.h"
+
 #ifdef CONFIG_PERFMON
 # include <asm/perfmon.h>
 #endif
@@ -46,7 +49,10 @@
 #include "sigframe.h"
 
 void (*ia64_mark_idle)(int);
+static cpumask_t cpu_idle_map;
 
+unsigned long boot_option_idle_override = 0;
+EXPORT_SYMBOL(boot_option_idle_override);
 
 void
 ia64_do_show_stack (struct unw_frame_info *info, void *arg)
@@ -74,12 +80,12 @@ void
 show_stack (struct task_struct *task, unsigned long *sp)
 {
        if (!task)
-               unw_init_running(ia64_do_show_stack, 0);
+               unw_init_running(ia64_do_show_stack, NULL);
        else {
                struct unw_frame_info info;
 
                unw_init_from_blocked_task(&info, task);
-               ia64_do_show_stack(&info, 0);
+               ia64_do_show_stack(&info, NULL);
        }
 }
 
@@ -138,7 +144,7 @@ show_regs (struct pt_regs *regs)
                ndirty = (regs->loadrs >> 19);
                bsp = ia64_rse_skip_regs((unsigned long *) regs->ar_bspstore, ndirty);
                for (i = 0; i < sof; ++i) {
-                       get_user(val, ia64_rse_skip_regs(bsp, i));
+                       get_user(val, (unsigned long __user *) ia64_rse_skip_regs(bsp, i));
                        printk("r%-3u:%c%016lx%s", 32 + i, is_nat ? '*' : ' ', val,
                               ((i == sof - 1) || (i % 3) == 2) ? "\n" : " ");
                }
@@ -185,6 +191,8 @@ default_idle (void)
        while (!need_resched())
                if (pal_halt && !pmu_active)
                        safe_halt();
+               else
+                       cpu_relax();
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
@@ -221,24 +229,47 @@ static inline void play_dead(void)
 }
 #endif /* CONFIG_HOTPLUG_CPU */
 
+
+void cpu_idle_wait(void)
+{
+        int cpu;
+        cpumask_t map;
+
+        for_each_online_cpu(cpu)
+                cpu_set(cpu, cpu_idle_map);
+
+        wmb();
+        do {
+                ssleep(1);
+                cpus_and(map, cpu_idle_map, cpu_online_map);
+        } while (!cpus_empty(map));
+}
+EXPORT_SYMBOL_GPL(cpu_idle_wait);
+
 void __attribute__((noreturn))
-cpu_idle (void *unused)
+cpu_idle (void)
 {
        void (*mark_idle)(int) = ia64_mark_idle;
+       int cpu = smp_processor_id();
 
        /* endless idle loop with no priority at all */
        while (1) {
-               void (*idle)(void) = pm_idle;
-               if (!idle)
-                       idle = default_idle;
-
 #ifdef CONFIG_SMP
                if (!need_resched())
                        min_xtp();
 #endif
                while (!need_resched()) {
+                       void (*idle)(void);
+
                        if (mark_idle)
                                (*mark_idle)(1);
+
+                       if (cpu_isset(cpu, cpu_idle_map))
+                               cpu_clear(cpu, cpu_idle_map);
+                       rmb();
+                       idle = pm_idle;
+                       if (!idle)
+                               idle = default_idle;
                        (*idle)();
                }
 
@@ -601,17 +632,19 @@ dump_fpu (struct pt_regs *pt, elf_fpregset_t dst)
        return 1;       /* f0-f31 are always valid so we always return 1 */
 }
 
-asmlinkage long
-sys_execve (char *filename, char **argv, char **envp, struct pt_regs *regs)
+long
+sys_execve (char __user *filename, char __user * __user *argv, char __user * __user *envp,
+           struct pt_regs *regs)
 {
+       char *fname;
        int error;
 
-       filename = getname(filename);
-       error = PTR_ERR(filename);
-       if (IS_ERR(filename))
+       fname = getname(filename);
+       error = PTR_ERR(fname);
+       if (IS_ERR(fname))
                goto out;
-       error = do_execve(filename, argv, envp, regs);
-       putname(filename);
+       error = do_execve(fname, argv, envp, regs);
+       putname(fname);
 out:
        return error;
 }
@@ -636,7 +669,7 @@ kernel_thread (int (*fn)(void *), void *arg, unsigned long flags)
        regs.pt.cr_ifs = 1UL << 63;             /* mark as valid, empty frame */
        regs.sw.ar_fpsr = regs.pt.ar_fpsr = ia64_getreg(_IA64_REG_AR_FPSR);
        regs.sw.ar_bspstore = (unsigned long) current + IA64_RBS_OFFSET;
-
+       regs.sw.pr = (1 << PRED_KERNEL_STACK);
        return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs.pt, 0, NULL, NULL);
 }
 EXPORT_SYMBOL(kernel_thread);
@@ -743,7 +776,7 @@ cpu_halt (void)
 void
 machine_restart (char *restart_cmd)
 {
-       (*efi.reset_system)(EFI_RESET_WARM, 0, 0, 0);
+       (*efi.reset_system)(EFI_RESET_WARM, 0, 0, NULL);
 }
 
 EXPORT_SYMBOL(machine_restart);