---

yaml --- r: 273024 b: refs/heads/master c: 5ade887 h: refs/heads/master v: v3
git-mirror · Nov 2, 2011 · 588ce2a · 588ce2a
1 parent 9144942
commit 588ce2a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cf5e62ab939022b43634d6608afd10a809b02b9
+refs/heads/master: 5ade8878e03a9a298a71efbf2895aa482e45448a
diff --git a/trunk/arch/um/include/shared/common-offsets.h b/trunk/arch/um/include/shared/common-offsets.h
@@ -2,7 +2,6 @@
 
 DEFINE(KERNEL_MADV_REMOVE, MADV_REMOVE);
 
-OFFSET(HOST_TASK_REGS, task_struct, thread.regs);
 OFFSET(HOST_TASK_PID, task_struct, pid);
 
 DEFINE(UM_KERN_PAGE_SIZE, PAGE_SIZE);

diff --git a/trunk/arch/um/include/shared/task.h b/trunk/arch/um/include/shared/task.h
diff --git a/trunk/arch/x86/um/bugs_32.c b/trunk/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;