aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorRoland McGrath <roland@redhat.com>2008-01-30 07:30:45 -0500
committerIngo Molnar <mingo@elte.hu>2008-01-30 07:30:45 -0500
commit13abd0e50433092c41551bc13c32268028b6d663 (patch)
tree25637d680966f6f021cf469614e5838963ead20c /arch/x86
parent12c3cbbb7e3218b1c3ed4c97b3496fc3f94ea967 (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>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/ia32/Makefile2
-rw-r--r--arch/x86/kernel/Makefile_641
-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 @@
2# Makefile for the ia32 kernel emulation subsystem. 2# Makefile for the ia32 kernel emulation subsystem.
3# 3#
4 4
5obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o tls32.o \ 5obj-$(CONFIG_IA32_EMULATION) := ia32entry.o sys_ia32.o ia32_signal.o \
6 ia32_binfmt.o fpu32.o ptrace32.o 6 ia32_binfmt.o fpu32.o ptrace32.o
7 7
8sysv-$(CONFIG_SYSVIPC) := ipc32.o 8sysv-$(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 \
13 pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \ 13 pci-dma_64.o pci-nommu_64.o alternative.o hpet.o tsc_64.o bugs_64.o \
14 i8253.o io_delay.o rtc.o 14 i8253.o io_delay.o rtc.o
15 15
16obj-$(CONFIG_IA32_EMULATION) += tls.o
16obj-$(CONFIG_STACKTRACE) += stacktrace.o 17obj-$(CONFIG_STACKTRACE) += stacktrace.o
17obj-y += cpu/ 18obj-y += cpu/
18obj-y += acpi/ 19obj-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)
26 26
27/* 27/*
28 * Set a given TLS descriptor: 28 * Set a given TLS descriptor:
29 * When you want addresses > 32bit use arch_prctl() 29 * When you want addresses > 32bit use arch_prctl()
30 */ 30 */
31int do_set_thread_area(struct thread_struct *t, struct user_desc __user *u_info) 31int do_set_thread_area(struct thread_struct *t, struct user_desc __user *u_info)
32{ 32{
@@ -76,9 +76,9 @@ int do_set_thread_area(struct thread_struct *t, struct user_desc __user *u_info)
76} 76}
77 77
78asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info) 78asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info)
79{ 79{
80 return do_set_thread_area(&current->thread, u_info); 80 return do_set_thread_area(&current->thread, u_info);
81} 81}
82 82
83 83
84/* 84/*
@@ -88,7 +88,7 @@ asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info)
88#define GET_LIMIT(desc) ( \ 88#define GET_LIMIT(desc) ( \
89 ((desc)->a & 0x0ffff) | \ 89 ((desc)->a & 0x0ffff) | \
90 ((desc)->b & 0xf0000) ) 90 ((desc)->b & 0xf0000) )
91 91
92#define GET_32BIT(desc) (((desc)->b >> 22) & 1) 92#define GET_32BIT(desc) (((desc)->b >> 22) & 1)
93#define GET_CONTENTS(desc) (((desc)->b >> 10) & 3) 93#define GET_CONTENTS(desc) (((desc)->b >> 10) & 3)
94#define GET_WRITABLE(desc) (((desc)->b >> 9) & 1) 94#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)
130asmlinkage long sys32_get_thread_area(struct user_desc __user *u_info) 130asmlinkage long sys32_get_thread_area(struct user_desc __user *u_info)
131{ 131{
132 return do_get_thread_area(&current->thread, u_info); 132 return do_get_thread_area(&current->thread, u_info);
133} 133}
134 134
135 135
136int ia32_child_tls(struct task_struct *p, struct pt_regs *childregs) 136int 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)
139 struct user_desc info; 139 struct user_desc info;
140 struct user_desc __user *cp; 140 struct user_desc __user *cp;
141 int idx; 141 int idx;
142 142
143 cp = (void __user *)childregs->rsi; 143 cp = (void __user *)childregs->rsi;
144 if (copy_from_user(&info, cp, sizeof(info))) 144 if (copy_from_user(&info, cp, sizeof(info)))
145 return -EFAULT; 145 return -EFAULT;
146 if (LDT_empty(&info)) 146 if (LDT_empty(&info))
147 return -EINVAL; 147 return -EINVAL;
148 148
149 idx = info.entry_number; 149 idx = info.entry_number;
150 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) 150 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
151 return -EINVAL; 151 return -EINVAL;
152 152
153 desc = (struct n_desc_struct *)(p->thread.tls_array) + idx - GDT_ENTRY_TLS_MIN; 153 desc = (struct n_desc_struct *)(p->thread.tls_array) + idx - GDT_ENTRY_TLS_MIN;
154 desc->a = LDT_entry_a(&info); 154 desc->a = LDT_entry_a(&info);
155 desc->b = LDT_entry_b(&info); 155 desc->b = LDT_entry_b(&info);