aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2006-01-12 04:05:40 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-12 12:08:51 -0500
commit06b425d80f56280e698b3e8487c372e0d39d9ba1 (patch)
tree107f441a080074b5fdc16cf4d94632356b29a1e5 /arch/i386
parent57eafdc22c8e788859b67c2c7ac4d636716603a5 (diff)
[PATCH] i386: task_thread_info()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386')
-rw-r--r--arch/i386/kernel/process.c4
-rw-r--r--arch/i386/kernel/vm86.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/i386/kernel/process.c b/arch/i386/kernel/process.c
index 035928f3f6c1..5dd03757f50c 100644
--- a/arch/i386/kernel/process.c
+++ b/arch/i386/kernel/process.c
@@ -601,8 +601,8 @@ static inline void disable_tsc(struct task_struct *prev_p,
601 * gcc should eliminate the ->thread_info dereference if 601 * gcc should eliminate the ->thread_info dereference if
602 * has_secure_computing returns 0 at compile time (SECCOMP=n). 602 * has_secure_computing returns 0 at compile time (SECCOMP=n).
603 */ 603 */
604 prev = prev_p->thread_info; 604 prev = task_thread_info(prev_p);
605 next = next_p->thread_info; 605 next = task_thread_info(next_p);
606 606
607 if (has_secure_computing(prev) || has_secure_computing(next)) { 607 if (has_secure_computing(prev) || has_secure_computing(next)) {
608 /* slow path here */ 608 /* slow path here */
diff --git a/arch/i386/kernel/vm86.c b/arch/i386/kernel/vm86.c
index cbdb0afed76a..0c90ae54ddfa 100644
--- a/arch/i386/kernel/vm86.c
+++ b/arch/i386/kernel/vm86.c
@@ -311,7 +311,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk
311 "movl %1,%%ebp\n\t" 311 "movl %1,%%ebp\n\t"
312 "jmp resume_userspace" 312 "jmp resume_userspace"
313 : /* no outputs */ 313 : /* no outputs */
314 :"r" (&info->regs), "r" (tsk->thread_info) : "ax"); 314 :"r" (&info->regs), "r" (task_thread_info(tsk)) : "ax");
315 /* we never return here */ 315 /* we never return here */
316} 316}
317 317