Commit 405b2fc6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pull-elfcore' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull elf coredumping updates from Al Viro:
 "Unification of regset and non-regset sides of ELF coredump handling.

  Collecting per-thread register values is the only thing that needs to
  be ifdefed there..."

* tag 'pull-elfcore' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  [elf] get rid of get_note_info_size()
  [elf] unify regset and non-regset cases
  [elf][non-regset] use elf_core_copy_task_regs() for dumper as well
  [elf][non-regset] uninline elf_core_copy_task_fpregs() (and lose pt_regs argument)
  elf_core_copy_task_regs(): task_pt_regs is defined everywhere
  [elf][regset] simplify thread list handling in fill_note_info()
  [elf][regset] clean fill_note_info() a bit
  kill extern of vsyscall32_sysctl
  kill coredump_params->regs
  kill signal_pt_regs()
parents 8702f2c6 38ba2f11

arch/alpha/include/asm/elf.h

+0 −6
Original line number Diff line number Diff line
@@ -120,12 +120,6 @@ extern int dump_elf_task(elf_greg_t *dest, struct task_struct *task); 
#define ELF_CORE_COPY_TASK_REGS(TASK, DEST) \

	dump_elf_task(*(DEST), TASK)



/* Similar, but for the FP registers.  */



extern int dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task);

#define ELF_CORE_COPY_FPREGS(TASK, DEST) \

	dump_elf_task_fp(*(DEST), TASK)



/* This yields a mask that user programs can use to figure out what

   instruction set this CPU supports.  This is trivial on Alpha, 

   but not so on other machines. */

arch/alpha/include/asm/ptrace.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 


#define current_pt_regs() \

  ((struct pt_regs *) ((char *)current_thread_info() + 2*PAGE_SIZE) - 1)

#define signal_pt_regs current_pt_regs



#define force_successful_syscall_return() (current_pt_regs()->r0 = 0)

arch/alpha/kernel/process.c

+3 −5
Original line number Diff line number Diff line
@@ -333,14 +333,12 @@ dump_elf_task(elf_greg_t *dest, struct task_struct *task) 
}

EXPORT_SYMBOL(dump_elf_task);



int

dump_elf_task_fp(elf_fpreg_t *dest, struct task_struct *task)

int elf_core_copy_task_fpregs(struct task_struct *t, elf_fpregset_t *fpu)

{

	struct switch_stack *sw = (struct switch_stack *)task_pt_regs(task) - 1;

	memcpy(dest, sw->fp, 32 * 8);

	struct switch_stack *sw = (struct switch_stack *)task_pt_regs(t) - 1;

	memcpy(fpu, sw->fp, 32 * 8);

	return 1;

}

EXPORT_SYMBOL(dump_elf_task_fp);



/*

 * Return saved PC of a blocked thread.  This assumes the frame

arch/csky/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 
#include <linux/kallsyms.h>

#include <linux/uaccess.h>

#include <linux/ptrace.h>

#include <linux/elfcore.h>



#include <asm/elf.h>

#include <abi/reg_ops.h>
@@ -69,12 +70,11 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) 
}



/* Fill in the fpu structure for a core dump.  */

int dump_fpu(struct pt_regs *regs, struct user_fp *fpu)

int elf_core_copy_task_fpregs(struct task_struct *t, elf_fpregset_t *fpu)

{

	memcpy(fpu, &current->thread.user_fp, sizeof(*fpu));

	return 1;

}

EXPORT_SYMBOL(dump_fpu);



int dump_task_regs(struct task_struct *tsk, elf_gregset_t *pr_regs)

{

arch/m68k/kernel/process.c

+2 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/rcupdate.h>

#include <linux/syscalls.h>

#include <linux/uaccess.h>

#include <linux/elfcore.h>



#include <asm/traps.h>

#include <asm/machdep.h>
@@ -213,7 +214,7 @@ int copy_thread(struct task_struct *p, const struct kernel_clone_args *args) 
}



/* Fill in the fpu structure for a core dump.  */

int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu)

int elf_core_copy_task_fpregs(struct task_struct *t, elf_fpregset_t *fpu)

{

	if (FPU_IS_EMU) {

		int i;
@@ -262,7 +263,6 @@ int dump_fpu (struct pt_regs *regs, struct user_m68kfp_struct *fpu) 


	return 1;

}

EXPORT_SYMBOL(dump_fpu);



unsigned long __get_wchan(struct task_struct *p)

{