diff options
| author | Roland McGrath | 2008-01-30 13:30:46 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2008-01-30 13:30:46 +0100 |
| commit | efd1ca52d04d2f6df337a3332cee56cd60e6d4c4 (patch) | |
| tree | cf1e630d25cc45f399388f5fc996d86cf3bcf9ff /include/asm-x86 | |
| parent | x86: tls32 moved (diff) | |
| download | kernel-qcow2-linux-efd1ca52d04d2f6df337a3332cee56cd60e6d4c4.tar.gz kernel-qcow2-linux-efd1ca52d04d2f6df337a3332cee56cd60e6d4c4.tar.xz kernel-qcow2-linux-efd1ca52d04d2f6df337a3332cee56cd60e6d4c4.zip | |
x86: TLS cleanup
This consolidates the four different places that implemented the same
encoding magic for the GDT-slot 32-bit TLS support. The old tls32.c was
renamed and is now only slightly modified to be the shared implementation.
Signed-off-by: Roland McGrath <roland@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Zachary Amsden <zach@vmware.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
| -rw-r--r-- | include/asm-x86/ia32.h | 6 | ||||
| -rw-r--r-- | include/asm-x86/ptrace.h | 11 |
2 files changed, 11 insertions, 6 deletions
diff --git a/include/asm-x86/ia32.h b/include/asm-x86/ia32.h index 0190b7c4e319..aa9733206e29 100644 --- a/include/asm-x86/ia32.h +++ b/include/asm-x86/ia32.h @@ -159,12 +159,6 @@ struct ustat32 { #define IA32_STACK_TOP IA32_PAGE_OFFSET #ifdef __KERNEL__ -struct user_desc; -struct siginfo_t; -int do_get_thread_area(struct thread_struct *t, struct user_desc __user *info); -int do_set_thread_area(struct thread_struct *t, struct user_desc __user *info); -int ia32_child_tls(struct task_struct *p, struct pt_regs *childregs); - struct linux_binprm; extern int ia32_setup_arg_pages(struct linux_binprm *bprm, unsigned long stack_top, int exec_stack); diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h index 51ddb2590870..105d1534eaf4 100644 --- a/include/asm-x86/ptrace.h +++ b/include/asm-x86/ptrace.h @@ -137,6 +137,17 @@ enum { }; #endif /* __KERNEL__ */ #endif /* !__i386__ */ + +#ifdef __KERNEL__ + +struct user_desc; +extern int do_get_thread_area(struct task_struct *p, int idx, + struct user_desc __user *info); +extern int do_set_thread_area(struct task_struct *p, int idx, + struct user_desc __user *info, int can_allocate); + +#endif /* __KERNEL__ */ + #endif /* !__ASSEMBLY__ */ #endif |