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

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
...@@ -50,7 +50,7 @@ void foo(void) ...@@ -50,7 +50,7 @@ void foo(void)
DEFINE(HOST_GS, GS); DEFINE(HOST_GS, GS);
DEFINE(HOST_ORIG_AX, ORIG_EAX); DEFINE(HOST_ORIG_AX, ORIG_EAX);
#else #else
#if defined(PTRACE_GETREGSET) && defined(PTRACE_SETREGSET) #ifdef FP_XSTATE_MAGIC1
DEFINE(HOST_FP_SIZE, sizeof(struct _xstate) / sizeof(unsigned long)); DEFINE(HOST_FP_SIZE, sizeof(struct _xstate) / sizeof(unsigned long));
#else #else
DEFINE(HOST_FP_SIZE, sizeof(struct _fpstate) / sizeof(unsigned long)); DEFINE(HOST_FP_SIZE, sizeof(struct _fpstate) / sizeof(unsigned long));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment