Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0e660d2d authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Tidy up ELF core dumps. 



These have been using overrides for ELF_CORE_COPY_TASK_REGS and
ELF_CORE_COPY_FPREGS while the generic versions can be used instead.
Presently the pt_regs are also duplicated across elf_core_copy_regs()
and elf_core_copy_task_regs(), this switches to simply copying out
through elf_core_copy_regs() instead.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 72461997

arch/sh/include/asm/elf.h

+0 −6
Original line number Original line Diff line number Diff line
@@ -198,12 +198,6 @@ do { \ 
#endif

#endif





#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)

#define SET_PERSONALITY(ex, ibcs2) set_personality(PER_LINUX_32BIT)

struct task_struct;

extern int dump_task_regs (struct task_struct *, elf_gregset_t *);

extern int dump_task_fpu (struct task_struct *, elf_fpregset_t *);



#define ELF_CORE_COPY_TASK_REGS(tsk, elf_regs) dump_task_regs(tsk, elf_regs)

#define ELF_CORE_COPY_FPREGS(tsk, elf_fpregs) dump_task_fpu(tsk, elf_fpregs)





#ifdef CONFIG_VSYSCALL

#ifdef CONFIG_VSYSCALL

/* vDSO has arch_setup_additional_pages */

/* vDSO has arch_setup_additional_pages */

arch/sh/kernel/Makefile_32

+0 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,6 @@ obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o 
obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_ELF_CORE)		+= dump_task.o

obj-$(CONFIG_IO_TRAPPED)	+= io_trapped.o

obj-$(CONFIG_IO_TRAPPED)	+= io_trapped.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

arch/sh/kernel/Makefile_64

+0 −1
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o 
obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_PM)		+= pm.o

obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_BINFMT_ELF)	+= dump_task.o

obj-$(CONFIG_IO_TRAPPED)	+= io_trapped.o

obj-$(CONFIG_IO_TRAPPED)	+= io_trapped.o





EXTRA_CFLAGS += -Werror
 
EXTRA_CFLAGS += -Werror

arch/sh/kernel/dump_task.c

deleted100644 → 0
+0 −32
Original line number Original line Diff line number Diff line 
#include <linux/elfcore.h>

#include <linux/sched.h>

#include <asm/fpu.h>



/*

 * Capture the user space registers if the task is not running (in user space)

 */

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

{

	struct pt_regs ptregs;



	ptregs = *task_pt_regs(tsk);

	elf_core_copy_regs(regs, &ptregs);



	return 1;

}



int dump_task_fpu(struct task_struct *tsk, elf_fpregset_t *fpu)

{

	int fpvalid = 0;



#if defined(CONFIG_SH_FPU)

	fpvalid = !!tsk_used_math(tsk);

	if (fpvalid) {

		unlazy_fpu(tsk, task_pt_regs(tsk));

		memcpy(fpu, &tsk->thread.fpu.hard, sizeof(*fpu));

	}

#endif



	return fpvalid;

}