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

Commit d25f2e12 authored by Jeff Dike's avatar Jeff Dike Committed by Linus Torvalds
Browse files

uml: use ptrace directly in libc code 



Some register accessor cleanups -
	userspace() was calling restore_registers and save_registers for no
reason, since userspace() is on the libc side of the house, and these
add no value over calling ptrace directly
	init_thread_registers and get_safe_registers were the same thing,
so init_thread_registers is gone

Signed-off-by: default avatarJeff Dike <jdike@linux.intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent ee3d9bd4

arch/um/include/registers.h

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ 
#include "sysdep/ptrace.h"

#include "sysdep/archsetjmp.h"



extern void init_thread_registers(struct uml_pt_regs *to);

extern int save_fp_registers(int pid, unsigned long *fp_regs);

extern int restore_fp_registers(int pid, unsigned long *fp_regs);

extern int save_fpx_registers(int pid, unsigned long *fp_regs);

arch/um/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, 
		arch_copy_thread(&current->thread.arch, &p->thread.arch);

	}

	else {

		init_thread_registers(&p->thread.regs.regs);

		get_safe_registers(p->thread.regs.regs.gp);

		p->thread.request.u.thread = current->thread.request.u.thread;

		handler = new_thread_handler;

	}

arch/um/os-Linux/registers.c

+4 −9
Original line number Diff line number Diff line
@@ -10,15 +10,6 @@ 
#include "sysdep/ptrace.h"

#include "user.h"



/* This is set once at boot time and not changed thereafter */



static unsigned long exec_regs[MAX_REG_NR];



void init_thread_registers(struct uml_pt_regs *to)

{

	memcpy(to->gp, exec_regs, sizeof(to->gp));

}



void save_registers(int pid, struct uml_pt_regs *regs)

{

	int err;
@@ -39,6 +30,10 @@ void restore_registers(int pid, struct uml_pt_regs *regs) 
		      "errno = %d\n", errno);

}



/* This is set once at boot time and not changed thereafter */



static unsigned long exec_regs[MAX_REG_NR];



void init_registers(int pid)

{

	int err;

arch/um/os-Linux/skas/process.c

+8 −3
Original line number Diff line number Diff line
@@ -300,7 +300,9 @@ void userspace(struct uml_pt_regs *regs) 
	nsecs += os_nsecs();



	while (1) {

		restore_registers(pid, regs);

		if (ptrace(PTRACE_SETREGS, pid, 0, regs->gp))

			panic("userspace - PTRACE_SETREGS failed, "

			      "errno = %d\n", errno);



		/* Now we set local_using_sysemu to be used for one loop */

		local_using_sysemu = get_using_sysemu();
@@ -320,7 +322,10 @@ void userspace(struct uml_pt_regs *regs) 
			      errno);



		regs->is_user = 1;

		save_registers(pid, regs);

		if (ptrace(PTRACE_GETREGS, pid, 0, regs->gp))

			panic("userspace - saving registers failed, "

			      "errno = %d\n", errno);



		UPT_SYSCALL_NR(regs) = -1; /* Assume: It's not a syscall */



		if (WIFSTOPPED(status)) {