diff options
| author | Roland McGrath <roland@redhat.com> | 2008-01-30 13:30:45 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:45 +0100 |
| commit | 13abd0e50433092c41551bc13c32268028b6d663 (patch) | |
| tree | 25637d680966f6f021cf469614e5838963ead20c | |
| parent | 12c3cbbb7e3218b1c3ed4c97b3496fc3f94ea967 (diff) | |
x86: tls32 moved
This renames arch/x86/ia32/tls32.c to arch/x86/kernel/tls.c, which does
nothing now but paves the way to consolidate this code for 32-bit too.
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>
| -rw-r--r-- | arch/x86/ia32/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/kernel/Makefile_64 | 1 | ||||
| -rw-r--r-- | arch/x86/kernel/tls.c (renamed from arch/x86/ia32/tls32.c) | 18 |
3 files changed, 11 insertions, 10 deletions
diff --git a/arch/x86/ia32/Makefile b/arch/x86/ia32/Makefile index 8c19b763b2fb..ea6088640847 100644 --- a/arch/x86/ia32/Makefile +++ b/arch/x86/ia32/Makefile @@ -2,7 +2,7 @@ # Makefile for the ia32 kernel emulation subsystem. # -obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o tls32.o \ +obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o \ ia32_binfmt.o fpu32.o ptrace32.o sysv-$(CONFIG_SYSVIPC) := ipc32.o diff --git a/arch/x86/kernel/Makefile_64 b/arch/x86/kernel/Makefile_64 index ae95d21ea885..e1ba82e582a8 100644 --- a/arch/x86/kernel/Makefile_64 +++ b/arch/x86/kernel/Makefile_64 @@ -13,6 +13,7 @@ obj-y := process_64.o signal_64.o entry_64.o traps_64.o irq_64.o \ pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \ i8253.o io_delay.o rtc.o +obj-$(CONFIG_IA32_EMULATION) += tls.o obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-y += cpu/ obj-y += acpi/ diff --git a/arch/x86/ia32/tls32.c b/arch/x86/kernel/tls.c index cac4b26b5895..5291596f19b0 100644 --- a/arch/x86/ia32/tls32.c +++ b/arch/x86/kernel/tls.c @@ -26,7 +26,7 @@ static int get_free_idx(void) /* * Set a given TLS descriptor: - * When you want addresses > 32bit use arch_prctl() + * When you want addresses > 32bit use arch_prctl() */ int do_set_thread_area(struct thread_struct *t, struct user_desc __user *u_info) { @@ -76,9 +76,9 @@ int do_set_thread_area(struct thread_struct *t, struct user_desc __user *u_info) } asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info) -{ - return do_set_thread_area(¤t->thread, u_info); -} +{ + return do_set_thread_area(¤t->thread, u_info); +} /* @@ -88,7 +88,7 @@ asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info) #define GET_LIMIT(desc) ( \ ((desc)->a & 0x0ffff) | \ ((desc)->b & 0xf0000) ) - + #define GET_32BIT(desc) (((desc)->b >> 22) & 1) #define GET_CONTENTS(desc) (((desc)->b >> 10) & 3) #define GET_WRITABLE(desc) (((desc)->b >> 9) & 1) @@ -130,7 +130,7 @@ int do_get_thread_area(struct thread_struct *t, struct user_desc __user *u_info) asmlinkage long sys32_get_thread_area(struct user_desc __user *u_info) { return do_get_thread_area(¤t->thread, u_info); -} +} int ia32_child_tls(struct task_struct *p, struct pt_regs *childregs) @@ -139,17 +139,17 @@ int ia32_child_tls(struct task_struct *p, struct pt_regs *childregs) struct user_desc info; struct user_desc __user *cp; int idx; - + cp = (void __user *)childregs->rsi; if (copy_from_user(&info, cp, sizeof(info))) return -EFAULT; if (LDT_empty(&info)) return -EINVAL; - + idx = info.entry_number; if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) return -EINVAL; - + desc = (struct n_desc_struct *)(p->thread.tls_array) + idx - GDT_ENTRY_TLS_MIN; desc->a = LDT_entry_a(&info); desc->b = LDT_entry_b(&info); |