diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-30 14:59:38 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-30 14:59:38 -0700 |
| commit | 0761fc15e353aab18e60efacb2faad0b873d3fa8 (patch) | |
| tree | b010468df95ae45540f465d63b9ff1f72377e11a /arch | |
| parent | dd689a68bc3551ad7bdff2c881fede5f0bd12cfa (diff) | |
| parent | 2fb44600fe784449404c6639de26af8361999ec7 (diff) | |
| download | linux-0761fc15e353aab18e60efacb2faad0b873d3fa8.tar.gz | |
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
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/um/user-offsets.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/um/user-offsets.c b/arch/x86/um/user-offsets.c index ae4cd58c0c7a..02250b2633b8 100644 --- a/arch/x86/um/user-offsets.c +++ b/arch/x86/um/user-offsets.c @@ -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)); |