diff options
| author | Al Viro | 2011-08-18 20:07:39 +0100 |
|---|---|---|
| committer | Richard Weinberger | 2011-11-02 14:15:08 +0100 |
| commit | 5ade8878e03a9a298a71efbf2895aa482e45448a (patch) | |
| tree | 4fd681b75b5c9adcddacbca810167cc4e24537e8 | |
| parent | 1cf5e62ab939022b43634d6608afd10a809b02b9 (diff) | |
um: kill shared/task.h and HOST_TASK_REGS
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
| -rw-r--r-- | arch/um/include/shared/common-offsets.h | 1 | ||||
| -rw-r--r-- | arch/um/include/shared/task.h | 9 | ||||
| -rw-r--r-- | arch/x86/um/bugs_32.c | 4 |
3 files changed, 3 insertions, 11 deletions
diff --git a/arch/um/include/shared/common-offsets.h b/arch/um/include/shared/common-offsets.h index 72009c7e3210..d7fe563aa7e7 100644 --- a/arch/um/include/shared/common-offsets.h +++ b/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/arch/um/include/shared/task.h b/arch/um/include/shared/task.h deleted file mode 100644 index 3db6b58b505e..000000000000 --- a/arch/um/include/shared/task.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef __TASK_H -#define __TASK_H - -#include <generated/asm-offsets.h> - -#define TASK_REGS(task) ((struct uml_pt_regs *) &(((char *) (task))[HOST_TASK_REGS])) -#define TASK_PID(task) *((int *) &(((char *) (task))[HOST_TASK_PID])) - -#endif diff --git a/arch/x86/um/bugs_32.c b/arch/x86/um/bugs_32.c index 7058e1fa903b..a1fba5fb9dbe 100644 --- 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; |