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

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

uml: remove include of asm/user.h 



I allowed an include of asm/user.h to sneak back in.  This patch replaces
it with sys/user.h.

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 529a4f4e

arch/um/os-Linux/sys-i386/registers.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 




#include <errno.h>

#include <errno.h>

#include <sys/ptrace.h>

#include <sys/ptrace.h>

#include <asm/user.h>

#include <sys/user.h>

#include "kern_constants.h"

#include "kern_constants.h"

#include "longjmp.h"

#include "longjmp.h"

#include "user.h"

#include "user.h"
@@ -76,7 +76,7 @@ int put_fp_registers(int pid, unsigned long *regs) 




void arch_init_registers(int pid)

void arch_init_registers(int pid)

{

{

	struct user_fxsr_struct fpx_regs;

	struct user_fpxregs_struct fpx_regs;

	int err;

	int err;





	err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs);

	err = ptrace(PTRACE_GETFPXREGS, pid, 0, &fpx_regs);