Commit 8d3e09b4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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



Pull regset conversion fix from Al Viro:
 "Fix a regression from an unnoticed bisect hazard in the regset series.

  A bunch of old (aout, originally) primitives used by coredumps became
  dead code after fdpic conversion to regsets. Removal of that dead code
  had been the first commit in the followups to regset series;
  unfortunately, it happened to hide the bisect hazard on sh (extern for
  fpregs_get() had not been updated in the main series when it should
  have been; followup simply made fpregs_get() static). And without that
  followup commit this bisect hazard became breakage in the mainline"

Tested-by: default avatarJohn Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  kill unused dump_fpu() instances
parents 9420f1ce bb1a773d

arch/arc/kernel/process.c

+0 −5
Original line number Diff line number Diff line
@@ -296,11 +296,6 @@ void flush_thread(void) 
{

}



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

{

	return 0;

}



int elf_check_arch(const struct elf32_hdr *x)

{

	unsigned int eflags;

arch/arm/kernel/process.c

+0 −15
Original line number Diff line number Diff line
@@ -281,21 +281,6 @@ int dump_task_regs(struct task_struct *t, elf_gregset_t *elfregs) 
	return 1;

}



/*

 * fill in the fpe structure for a core dump...

 */

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

{

	struct thread_info *thread = current_thread_info();

	int used_math = thread->used_cp[1] | thread->used_cp[2];



	if (used_math)

		memcpy(fp, &thread->fpstate.soft, sizeof (*fp));



	return used_math != 0;

}

EXPORT_SYMBOL(dump_fpu);



unsigned long get_wchan(struct task_struct *p)

{

	struct stackframe frame;

arch/hexagon/kernel/process.c

+0 −9
Original line number Diff line number Diff line
@@ -153,15 +153,6 @@ unsigned long get_wchan(struct task_struct *p) 
	return 0;

}



/*

 * Required placeholder.

 */

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

{

	return 0;

}





/*

 * Called on the exit path of event entry; see vm_entry.S

 *

arch/ia64/kernel/process.c

+0 −34
Original line number Diff line number Diff line
@@ -530,52 +530,18 @@ do_copy_task_regs (struct task_struct *task, struct unw_frame_info *info, void * 
	unw_get_ar(info, UNW_AR_SSD, &dst[56]);

}



void

do_dump_task_fpu (struct task_struct *task, struct unw_frame_info *info, void *arg)

{

	elf_fpreg_t *dst = arg;

	int i;



	memset(dst, 0, sizeof(elf_fpregset_t));	/* don't leak any "random" bits */



	if (unw_unwind_to_user(info) < 0)

		return;



	/* f0 is 0.0, f1 is 1.0 */



	for (i = 2; i < 32; ++i)

		unw_get_fr(info, i, dst + i);



	ia64_flush_fph(task);

	if ((task->thread.flags & IA64_THREAD_FPH_VALID) != 0)

		memcpy(dst + 32, task->thread.fph, 96*16);

}



void

do_copy_regs (struct unw_frame_info *info, void *arg)

{

	do_copy_task_regs(current, info, arg);

}



void

do_dump_fpu (struct unw_frame_info *info, void *arg)

{

	do_dump_task_fpu(current, info, arg);

}



void

ia64_elf_core_copy_regs (struct pt_regs *pt, elf_gregset_t dst)

{

	unw_init_running(do_copy_regs, dst);

}



int

dump_fpu (struct pt_regs *pt, elf_fpregset_t dst)

{

	unw_init_running(do_dump_fpu, dst);

	return 1;	/* f0-f31 are always valid so we always return 1 */

}



/*

 * Flush thread state.  This is called when a thread does an execve().

 */

arch/nios2/kernel/process.c

+0 −8
Original line number Diff line number Diff line
@@ -252,14 +252,6 @@ void start_thread(struct pt_regs *regs, unsigned long pc, unsigned long sp) 
	regs->sp = sp;

}



#include <linux/elfcore.h>



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

int dump_fpu(struct pt_regs *regs, elf_fpregset_t *r)

{

	return 0; /* Nios2 has no FPU and thus no FPU registers */

}



asmlinkage int nios2_clone(unsigned long clone_flags, unsigned long newsp,

			   int __user *parent_tidptr, int __user *child_tidptr,

			   unsigned long tls)

CRA Git | Maintained and supported by SUSTech CRA and CCSE