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

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

uml: remove unused sigcontext accessors 



The macros which extract registers from a struct sigcontext are no longer
needed and can be removed.  They are starting not to build anyway, given the
removal of the 'e' and 'r' from register names during the x86 merge.

Cc: Jiri Olsa <olsajiri@gmail.com>
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 f3069ae9

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

+0 −27
Original line number Diff line number Diff line
@@ -17,36 +17,9 @@ 


void foo(void)

{

	OFFSET(HOST_SC_IP, sigcontext, eip);

	OFFSET(HOST_SC_SP, sigcontext, esp);

	OFFSET(HOST_SC_FS, sigcontext, fs);

	OFFSET(HOST_SC_GS, sigcontext, gs);

	OFFSET(HOST_SC_DS, sigcontext, ds);

	OFFSET(HOST_SC_ES, sigcontext, es);

	OFFSET(HOST_SC_SS, sigcontext, ss);

	OFFSET(HOST_SC_CS, sigcontext, cs);

	OFFSET(HOST_SC_EFLAGS, sigcontext, eflags);

	OFFSET(HOST_SC_EAX, sigcontext, eax);

	OFFSET(HOST_SC_EBX, sigcontext, ebx);

	OFFSET(HOST_SC_ECX, sigcontext, ecx);

	OFFSET(HOST_SC_EDX, sigcontext, edx);

	OFFSET(HOST_SC_EDI, sigcontext, edi);

	OFFSET(HOST_SC_ESI, sigcontext, esi);

	OFFSET(HOST_SC_EBP, sigcontext, ebp);

	OFFSET(HOST_SC_TRAPNO, sigcontext, trapno);

	OFFSET(HOST_SC_ERR, sigcontext, err);

	OFFSET(HOST_SC_CR2, sigcontext, cr2);

	OFFSET(HOST_SC_FPSTATE, sigcontext, fpstate);

	OFFSET(HOST_SC_SIGMASK, sigcontext, oldmask);

	OFFSET(HOST_SC_FP_CW, _fpstate, cw);

	OFFSET(HOST_SC_FP_SW, _fpstate, sw);

	OFFSET(HOST_SC_FP_TAG, _fpstate, tag);

	OFFSET(HOST_SC_FP_IPOFF, _fpstate, ipoff);

	OFFSET(HOST_SC_FP_CSSEL, _fpstate, cssel);

	OFFSET(HOST_SC_FP_DATAOFF, _fpstate, dataoff);

	OFFSET(HOST_SC_FP_DATASEL, _fpstate, datasel);

	OFFSET(HOST_SC_FP_ST, _fpstate, _st);

	OFFSET(HOST_SC_FXSR_ENV, _fpstate, _fxsr_env);



	DEFINE_LONGS(HOST_FP_SIZE, sizeof(struct user_fpregs_struct));

	DEFINE_LONGS(HOST_XFP_SIZE, sizeof(struct user_fpxregs_struct));

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

+0 −28
Original line number Diff line number Diff line
@@ -19,37 +19,9 @@ 


void foo(void)

{

	OFFSET(HOST_SC_RBX, sigcontext, rbx);

	OFFSET(HOST_SC_RCX, sigcontext, rcx);

	OFFSET(HOST_SC_RDX, sigcontext, rdx);

	OFFSET(HOST_SC_RSI, sigcontext, rsi);

	OFFSET(HOST_SC_RDI, sigcontext, rdi);

	OFFSET(HOST_SC_RBP, sigcontext, rbp);

	OFFSET(HOST_SC_RAX, sigcontext, rax);

	OFFSET(HOST_SC_R8, sigcontext, r8);

	OFFSET(HOST_SC_R9, sigcontext, r9);

	OFFSET(HOST_SC_R10, sigcontext, r10);

	OFFSET(HOST_SC_R11, sigcontext, r11);

	OFFSET(HOST_SC_R12, sigcontext, r12);

	OFFSET(HOST_SC_R13, sigcontext, r13);

	OFFSET(HOST_SC_R14, sigcontext, r14);

	OFFSET(HOST_SC_R15, sigcontext, r15);

	OFFSET(HOST_SC_IP, sigcontext, rip);

	OFFSET(HOST_SC_SP, sigcontext, rsp);

	OFFSET(HOST_SC_CR2, sigcontext, cr2);

	OFFSET(HOST_SC_ERR, sigcontext, err);

	OFFSET(HOST_SC_TRAPNO, sigcontext, trapno);

	OFFSET(HOST_SC_CS, sigcontext, cs);

	OFFSET(HOST_SC_FS, sigcontext, fs);

	OFFSET(HOST_SC_GS, sigcontext, gs);

	OFFSET(HOST_SC_EFLAGS, sigcontext, eflags);

	OFFSET(HOST_SC_SIGMASK, sigcontext, oldmask);

#if 0

	OFFSET(HOST_SC_ORIG_RAX, sigcontext, orig_rax);

	OFFSET(HOST_SC_DS, sigcontext, ds);

	OFFSET(HOST_SC_ES, sigcontext, es);

	OFFSET(HOST_SC_SS, sigcontext, ss);

#endif



	DEFINE(HOST_FP_SIZE, sizeof(struct _fpstate) / sizeof(unsigned long));

	DEFINE(HOST_XFP_SIZE, 0);