Commit 37373d9c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'regset.followup' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs 

Pull regset updates from Al Viro:
 "Dead code removal, mostly.

  The only exception is a bit of cleanups on itanic (getting rid of
  redundant stack unwinds - each access_uarea() call does it and we call
  that 7 times in a row in ptrace_[sg]etregs(), *after* having done it
  ourselves in the caller; location where the user registers have been
  spilled won't change under us, and we can bloody well just call
  access_elf_reg() directly, giving it the unw_frame_info we'd
  calculated for our own purposes)"

* 'regset.followup' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  c6x: kill ELF_CORE_COPY_FPREGS
  whack-a-mole: USE_ELF_CORE_DUMP
  [ia64] ptrace_[sg]etregs(): use access_elf_reg() instead of access_uarea()
  [ia64] missed cleanups from switch to regset coredumps
  arm: kill dump_task_regs()
parents 1a825a6a d4948d19

arch/arm/include/asm/elf.h

+0 −4
Original line number Diff line number Diff line
@@ -111,10 +111,6 @@ extern int elf_check_arch(const struct elf32_hdr *); 
extern int arm_elf_read_implies_exec(int);

#define elf_read_implies_exec(ex,stk) arm_elf_read_implies_exec(stk)



struct task_struct;

int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs);

#define ELF_CORE_COPY_TASK_REGS dump_task_regs



#define CORE_DUMP_USE_REGSET

#define ELF_EXEC_PAGESIZE	4096

arch/arm/kernel/process.c

+0 −9
Original line number Diff line number Diff line
@@ -272,15 +272,6 @@ int copy_thread(unsigned long clone_flags, unsigned long stack_start, 
	return 0;

}



/*

 * Fill in the task's elfregs structure for a core dump.

 */

int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs)

{

	elf_core_copy_regs(elfregs, task_pt_regs(t));

	return 1;

}



unsigned long get_wchan(struct task_struct *p)

{

	struct stackframe frame;

arch/c6x/include/asm/elf.h

+0 −3
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ do { \ 


#define ELF_FDPIC_CORE_EFLAGS	0



#define ELF_CORE_COPY_FPREGS(...) 0 /* No FPU regs to copy */



/*

 * These are used to set parameters in the core dumps.

 */
@@ -56,7 +54,6 @@ do { \ 
/* Nothing for now. Need to setup DP... */

#define ELF_PLAT_INIT(_r)



#define USE_ELF_CORE_DUMP

#define ELF_EXEC_PAGESIZE	4096



#define ELF_CORE_COPY_REGS(_dest, _regs)		\

arch/csky/include/asm/elf.h

+0 −1
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG]; 
/*

 * These are used to set parameters in the core dumps.

 */

#define USE_ELF_CORE_DUMP

#define ELF_EXEC_PAGESIZE		4096

#define ELF_CLASS			ELFCLASS32

#define ELF_PLAT_INIT(_r, load_addr)	{ _r->a0 = 0; }

arch/hexagon/include/asm/elf.h

+0 −1
Original line number Diff line number Diff line
@@ -181,7 +181,6 @@ do { \ 
 */

#define ELF_PLAT_INIT(regs, load_addr) do { } while (0)



#define USE_ELF_CORE_DUMP

#define CORE_DUMP_USE_REGSET



/* Hrm is this going to cause problems for changing PAGE_SIZE?  */

CRA Git | Maintained and supported by SUSTech CRA and CCSE