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

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

uml: don't use glibc asm/user.h 



Stop including asm/user.h from libc - it seems to be disappearing from
distros.  It's replaced with sys/user.h which defines user_fpregs_struct and
user_fpxregs_struct instead of user_i387_struct and struct user_fxsr_struct on
i386.

As a bonus, on x86_64, I get to dump some stupid typedefs which were needed in
order to get asm/user.h to compile.

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 84b3db04

arch/um/sys-i386/user-offsets.c

+3 −3
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ 
#include <stddef.h>

#include <signal.h>

#include <sys/poll.h>

#include <sys/user.h>

#include <sys/mman.h>

#include <asm/ptrace.h>

#include <asm/user.h>



#define DEFINE(sym, val) \

	asm volatile("\n->" #sym " %0 " #val : : "i" (val))
@@ -48,8 +48,8 @@ void foo(void) 
	OFFSET(HOST_SC_FP_ST, _fpstate, _st);

	OFFSET(HOST_SC_FXSR_ENV, _fpstate, _fxsr_env);



	DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_i387_struct));

	DEFINE_LONGS(HOST_XFP_SIZE, sizeof(struct user_fxsr_struct));

	DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_fpregs_struct));

	DEFINE_LONGS(HOST_XFP_SIZE, sizeof(struct user_fpxregs_struct));



	DEFINE(HOST_IP, EIP);

	DEFINE(HOST_SP, UESP);

arch/um/sys-x86_64/user-offsets.c

+1 −8
Original line number Diff line number Diff line
@@ -3,17 +3,10 @@ 
#include <signal.h>

#include <sys/poll.h>

#include <sys/mman.h>

#include <sys/user.h>

#define __FRAME_OFFSETS

#include <asm/ptrace.h>

#include <asm/types.h>

/* For some reason, x86_64 defines u64 and u32 only in <pci/types.h>, which I

 * refuse to include here, even though they're used throughout the headers.

 * These are used in asm/user.h, and that include can't be avoided because of

 * the sizeof(struct user_regs_struct) below.

 */

typedef __u64 u64;

typedef __u32 u32;

#include <asm/user.h>



#define DEFINE(sym, val) \

        asm volatile("\n->" #sym " %0 " #val : : "i" (val))