diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-01-30 16:30:48 -0500 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2012-03-24 19:29:55 -0400 |
commit | c2220b2a124d2fe7b0074b23680177c8e905a76c (patch) | |
tree | f88ed3858ce65669134888f64193ab139a8a95dc /arch/x86/um/bugs_32.c | |
parent | 28a12cb598e55ca9e1c577899d6624e6a83cdc56 (diff) |
um: kill HOST_TASK_PID
just provide get_current_pid() to the userland side of things
instead of get_current() + manual poking in its results
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/x86/um/bugs_32.c')
-rw-r--r-- | arch/x86/um/bugs_32.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86/um/bugs_32.c b/arch/x86/um/bugs_32.c index a1fba5fb9dbe..17d88cf2c6c4 100644 --- a/arch/x86/um/bugs_32.c +++ b/arch/x86/um/bugs_32.c | |||
@@ -13,8 +13,6 @@ | |||
13 | static int host_has_cmov = 1; | 13 | static int host_has_cmov = 1; |
14 | static jmp_buf cmov_test_return; | 14 | static jmp_buf cmov_test_return; |
15 | 15 | ||
16 | #define TASK_PID(task) *((int *) &(((char *) (task))[HOST_TASK_PID])) | ||
17 | |||
18 | static void cmov_sigill_test_handler(int sig) | 16 | static void cmov_sigill_test_handler(int sig) |
19 | { | 17 | { |
20 | host_has_cmov = 0; | 18 | host_has_cmov = 0; |
@@ -51,7 +49,7 @@ void arch_examine_signal(int sig, struct uml_pt_regs *regs) | |||
51 | * This is testing for a cmov (0x0f 0x4x) instruction causing a | 49 | * This is testing for a cmov (0x0f 0x4x) instruction causing a |
52 | * SIGILL in init. | 50 | * SIGILL in init. |
53 | */ | 51 | */ |
54 | if ((sig != SIGILL) || (TASK_PID(get_current()) != 1)) | 52 | if ((sig != SIGILL) || (get_current_pid() != 1)) |
55 | return; | 53 | return; |
56 | 54 | ||
57 | if (copy_from_user_proc(tmp, (void *) UPT_IP(regs), 2)) { | 55 | if (copy_from_user_proc(tmp, (void *) UPT_IP(regs), 2)) { |