3 files changed, 7 insertions, 16 deletions

diff --git a/arch/mips/kernel/irixelf.c b/arch/mips/kernel/irixelf.c
index 7ce34d4aa220..10d3644e3608 100644
--- a/arch/mips/kernel/irixelf.c
+++ b/arch/mips/kernel/irixelf.c
@@ -1077,8 +1077,8 @@ static int irix_core_dump(long signr, struct pt_regs * regs, struct file *file)
         struct elfhdr elf;
         off_t offset = 0, dataoff;
         int limit = current->signal->rlim[RLIMIT_CORE].rlim_cur;
-        int numnote = 4;
-        struct memelfnote notes[4];
+        int numnote = 3;
+        struct memelfnote notes[3];
         struct elf_prstatus prstatus;   /* NT_PRSTATUS */
         elf_fpregset_t fpu;             /* NT_PRFPREG */
         struct elf_prpsinfo psinfo;     /* NT_PRPSINFO */
@@ -1211,20 +1211,15 @@ static int irix_core_dump(long signr, struct pt_regs * regs, struct file *file)
         }
         strlcpy(psinfo.pr_fname, current->comm, sizeof(psinfo.pr_fname));
 
-        notes[2].name = "CORE";
-        notes[2].type = NT_TASKSTRUCT;
-        notes[2].datasz = sizeof(*current);
-        notes[2].data = current;
-
         /* Try to dump the FPU. */
         prstatus.pr_fpvalid = dump_fpu (regs, &fpu);
         if (!prstatus.pr_fpvalid) {
                 numnote--;
         } else {
-                notes[3].name = "CORE";
-                notes[3].type = NT_PRFPREG;
-                notes[3].datasz = sizeof(fpu);
-                notes[3].data = &fpu;
+                notes[2].name = "CORE";
+                notes[2].type = NT_PRFPREG;
+                notes[2].datasz = sizeof(fpu);
+                notes[2].data = &fpu;
         }
 
         /* Write notes phdr entry. */
diff --git a/arch/mips/kernel/ptrace.c b/arch/mips/kernel/ptrace.c
index fcceab8f2e00..f1b0f3e1f95b 100644
--- a/arch/mips/kernel/ptrace.c
+++ b/arch/mips/kernel/ptrace.c
@@ -174,7 +174,7 @@ int ptrace_setfpregs (struct task_struct *child, __u32 __user *data)
         return 0;
 }
 
-asmlinkage int sys_ptrace(long request, long pid, long addr, long data)
+asmlinkage long sys_ptrace(long request, long pid, long addr, long data)
 {
         struct task_struct *child;
         int ret;
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index a24651dfaaba..787ed541d442 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -45,10 +45,6 @@
 
 #define TICK_SIZE       (tick_nsec / 1000)
 
-u64 jiffies_64 = INITIAL_JIFFIES;
-
-EXPORT_SYMBOL(jiffies_64);
-
 /*
  * forward reference
  */