- Update to 2.6.25-rc3.

[linux-flexiantxendom0-3.2.10.git] / arch / sparc64 / kernel / process.c

diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index ca7cdfd..2aafce7 100644 (file)
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -24,13 +24,13 @@
 #include <linux/ptrace.h>
 #include <linux/slab.h>
 #include <linux/user.h>
-#include <linux/a.out.h>
 #include <linux/reboot.h>
 #include <linux/delay.h>
 #include <linux/compat.h>
 #include <linux/tick.h>
 #include <linux/init.h>
 #include <linux/cpu.h>
+#include <linux/elfcore.h>
 
 #include <asm/oplib.h>
 #include <asm/uaccess.h>
@@ -48,6 +48,8 @@
 #include <asm/unistd.h>
 #include <asm/hypervisor.h>
 #include <asm/sstate.h>
+#include <asm/reboot.h>
+#include <asm/syscalls.h>
 
 /* #define VERBOSE_SHOWREGS */
 
@@ -114,16 +116,9 @@ void cpu_idle(void)
 
 extern char reboot_command [];
 
-extern void (*prom_palette)(int);
-extern void (*prom_keyboard)(void);
-
 void machine_halt(void)
 {
        sstate_halt();
-       if (prom_palette)
-               prom_palette (1);
-       if (prom_keyboard)
-               prom_keyboard();
        prom_halt();
        panic("Halt failed!");
 }
@@ -131,10 +126,6 @@ void machine_halt(void)
 void machine_alt_power_off(void)
 {
        sstate_poweroff();
-       if (prom_palette)
-               prom_palette(1);
-       if (prom_keyboard)
-               prom_keyboard();
        prom_halt_power_off();
        panic("Power-off failed!");
 }
@@ -146,10 +137,6 @@ void machine_restart(char * cmd)
        sstate_reboot();
        p = strchr (reboot_command, '\n');
        if (p) *p = 0;
-       if (prom_palette)
-               prom_palette (1);
-       if (prom_keyboard)
-               prom_keyboard();
        if (cmd)
                prom_reboot(cmd);
        if (*reboot_command)
@@ -227,62 +214,6 @@ static void show_regwindow(struct pt_regs *regs)
                print_symbol("I7: <%s>\n", rwk->ins[7]);
 }
 
-void show_stackframe(struct sparc_stackf *sf)
-{
-       unsigned long size;
-       unsigned long *stk;
-       int i;
-
-       printk("l0: %016lx l1: %016lx l2: %016lx l3: %016lx\n"
-              "l4: %016lx l5: %016lx l6: %016lx l7: %016lx\n",
-              sf->locals[0], sf->locals[1], sf->locals[2], sf->locals[3],
-              sf->locals[4], sf->locals[5], sf->locals[6], sf->locals[7]);
-       printk("i0: %016lx i1: %016lx i2: %016lx i3: %016lx\n"
-              "i4: %016lx i5: %016lx fp: %016lx ret_pc: %016lx\n",
-              sf->ins[0], sf->ins[1], sf->ins[2], sf->ins[3],
-              sf->ins[4], sf->ins[5], (unsigned long)sf->fp, sf->callers_pc);
-       printk("sp: %016lx x0: %016lx x1: %016lx x2: %016lx\n"
-              "x3: %016lx x4: %016lx x5: %016lx xx: %016lx\n",
-              (unsigned long)sf->structptr, sf->xargs[0], sf->xargs[1],
-              sf->xargs[2], sf->xargs[3], sf->xargs[4], sf->xargs[5],
-              sf->xxargs[0]);
-       size = ((unsigned long)sf->fp) - ((unsigned long)sf);
-       size -= STACKFRAME_SZ;
-       stk = (unsigned long *)((unsigned long)sf + STACKFRAME_SZ);
-       i = 0;
-       do {
-               printk("s%d: %016lx\n", i++, *stk++);
-       } while ((size -= sizeof(unsigned long)));
-}
-
-void show_stackframe32(struct sparc_stackf32 *sf)
-{
-       unsigned long size;
-       unsigned *stk;
-       int i;
-
-       printk("l0: %08x l1: %08x l2: %08x l3: %08x\n",
-              sf->locals[0], sf->locals[1], sf->locals[2], sf->locals[3]);
-       printk("l4: %08x l5: %08x l6: %08x l7: %08x\n",
-              sf->locals[4], sf->locals[5], sf->locals[6], sf->locals[7]);
-       printk("i0: %08x i1: %08x i2: %08x i3: %08x\n",
-              sf->ins[0], sf->ins[1], sf->ins[2], sf->ins[3]);
-       printk("i4: %08x i5: %08x fp: %08x ret_pc: %08x\n",
-              sf->ins[4], sf->ins[5], sf->fp, sf->callers_pc);
-       printk("sp: %08x x0: %08x x1: %08x x2: %08x\n"
-              "x3: %08x x4: %08x x5: %08x xx: %08x\n",
-              sf->structptr, sf->xargs[0], sf->xargs[1],
-              sf->xargs[2], sf->xargs[3], sf->xargs[4], sf->xargs[5],
-              sf->xxargs[0]);
-       size = ((unsigned long)sf->fp) - ((unsigned long)sf);
-       size -= STACKFRAME32_SZ;
-       stk = (unsigned *)((unsigned long)sf + STACKFRAME32_SZ);
-       i = 0;
-       do {
-               printk("s%d: %08x\n", i++, *stk++);
-       } while ((size -= sizeof(unsigned)));
-}
-
 #ifdef CONFIG_SMP
 static DEFINE_SPINLOCK(regdump_lock);
 #endif
@@ -370,24 +301,6 @@ void show_regs(struct pt_regs *regs)
 #endif
 }
 
-void show_regs32(struct pt_regs32 *regs)
-{
-       printk("PSR: %08x PC: %08x NPC: %08x Y: %08x    %s\n", regs->psr,
-              regs->pc, regs->npc, regs->y, print_tainted());
-       printk("g0: %08x g1: %08x g2: %08x g3: %08x ",
-              regs->u_regs[0], regs->u_regs[1], regs->u_regs[2],
-              regs->u_regs[3]);
-       printk("g4: %08x g5: %08x g6: %08x g7: %08x\n",
-              regs->u_regs[4], regs->u_regs[5], regs->u_regs[6],
-              regs->u_regs[7]);
-       printk("o0: %08x o1: %08x o2: %08x o3: %08x ",
-              regs->u_regs[8], regs->u_regs[9], regs->u_regs[10],
-              regs->u_regs[11]);
-       printk("o4: %08x o5: %08x sp: %08x ret_pc: %08x\n",
-              regs->u_regs[12], regs->u_regs[13], regs->u_regs[14],
-              regs->u_regs[15]);
-}
-
 unsigned long thread_saved_pc(struct task_struct *tsk)
 {
        struct thread_info *ti = task_thread_info(tsk);
@@ -725,17 +638,6 @@ pid_t kernel_thread(int (*fn)(void *), void * arg, unsigned long flags)
        return retval;
 }
 
-/*
- * fill in the user structure for a core dump..
- */
-void dump_thread(struct pt_regs * regs, struct user * dump)
-{
-       /* Only should be used for SunOS and ancient a.out
-        * SparcLinux binaries...  Not worth implementing.
-        */
-       memset(dump, 0, sizeof(struct user));
-}
-
 typedef struct {
        union {
                unsigned int    pr_regs[32];