Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[~andy/linux] / arch / x86 / um / bugs_32.c

diff --git a/arch/x86/um/bugs_32.c b/arch/x86/um/bugs_32.c
index 7058e1fa903b439fb657b872205bfa2095e24247..a1fba5fb9dbe0630ddbf42c53f6221b6bb2b6d31 100644 (file)
--- a/arch/x86/um/bugs_32.c
+++ b/arch/x86/um/bugs_32.c
@@ -6,13 +6,15 @@
 #include <signal.h>
 #include "kern_util.h"
 #include "longjmp.h"
-#include "task.h"
 #include "sysdep/ptrace.h"
+#include <generated/asm-offsets.h>
 
 /* Set during early boot */
 static int host_has_cmov = 1;
 static jmp_buf cmov_test_return;
 
+#define TASK_PID(task) *((int *) &(((char *) (task))[HOST_TASK_PID]))
+
 static void cmov_sigill_test_handler(int sig)
 {
        host_has_cmov = 0;