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

Commit 0761fc15 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml 

Pull UML fix from Richard Weinberger:
 "This contains a single fix for a regression which was introduced while
  the merge window"

* 'for-linus-4.13-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml:
  um: Fix check for _xstate for older hosts
parents dd689a68 2fb44600

arch/x86/um/user-offsets.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ void foo(void) 
	DEFINE(HOST_GS, GS);

	DEFINE(HOST_ORIG_AX, ORIG_EAX);

#else

#if defined(PTRACE_GETREGSET) && defined(PTRACE_SETREGSET)

#ifdef FP_XSTATE_MAGIC1

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

#else

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