Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm

[linux-2.6] / arch / sparc64 / kernel / process.c

diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 548af5d1f2c4d2d77900e913caaaa76363b23d3d..acf8c5250aa9822f633e7367b662ea6f883a4059 100644 (file)
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -30,6 +30,7 @@
 #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 +49,7 @@
 #include <asm/hypervisor.h>
 #include <asm/sstate.h>
 #include <asm/reboot.h>
+#include <asm/syscalls.h>
 
 /* #define VERBOSE_SHOWREGS */
 
@@ -112,8 +114,6 @@ void cpu_idle(void)
        }
 }
 
-extern char reboot_command [];
-
 void machine_halt(void)
 {
        sstate_halt();
@@ -299,24 +299,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);
@@ -749,9 +731,6 @@ asmlinkage int sparc_execve(struct pt_regs *regs)
                current_thread_info()->xfsr[0] = 0;
                current_thread_info()->fpsaved[0] = 0;
                regs->tstate &= ~TSTATE_PEF;
-               task_lock(current);
-               current->ptrace &= ~PT_DTRACE;
-               task_unlock(current);
        }
 out:
        return error;