openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Roland McGrath 2008-01-30 13:30:45 +01:00 committed by Ingo Molnar
parent 12c3cbbb7e
commit 13abd0e504
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/ia32/Makefile
View File

@ -2,7 +2,7 @@
# Makefile for the ia32 kernel emulation subsystem. # 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 ia32_binfmt.o fpu32.o ptrace32.o
sysv-$(CONFIG_SYSVIPC) := ipc32.o sysv-$(CONFIG_SYSVIPC) := ipc32.o

1
arch/x86/kernel/Makefile_64
View File

@ -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 \ 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 i8253.o io_delay.o rtc.o
obj-$(CONFIG_IA32_EMULATION) += tls.o
obj-$(CONFIG_STACKTRACE) += stacktrace.o obj-$(CONFIG_STACKTRACE) += stacktrace.o
obj-y += cpu/ obj-y += cpu/
obj-y += acpi/ obj-y += acpi/

18
arch/x86/ia32/tls32.c → arch/x86/kernel/tls.c
View File

@ -26,7 +26,7 @@ static int get_free_idx(void)
/* /*
* Set a given TLS descriptor: * 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) 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) asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info)
{ {
return do_set_thread_area(&current->thread, u_info); return do_set_thread_area(&current->thread, u_info);
} }
/* /*
@ -88,7 +88,7 @@ asmlinkage long sys32_set_thread_area(struct user_desc __user *u_info)
#define GET_LIMIT(desc) ( \ #define GET_LIMIT(desc) ( \
((desc)->a & 0x0ffff) | \ ((desc)->a & 0x0ffff) | \
((desc)->b & 0xf0000) ) ((desc)->b & 0xf0000) )
#define GET_32BIT(desc) (((desc)->b >> 22) & 1) #define GET_32BIT(desc) (((desc)->b >> 22) & 1)
#define GET_CONTENTS(desc) (((desc)->b >> 10) & 3) #define GET_CONTENTS(desc) (((desc)->b >> 10) & 3)
#define GET_WRITABLE(desc) (((desc)->b >> 9) & 1) #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) asmlinkage long sys32_get_thread_area(struct user_desc __user *u_info)
{ {
return do_get_thread_area(&current->thread, u_info); return do_get_thread_area(&current->thread, u_info);
} }
int ia32_child_tls(struct task_struct *p, struct pt_regs *childregs) 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 info;
struct user_desc __user *cp; struct user_desc __user *cp;
int idx; int idx;
cp = (void __user *)childregs->rsi; cp = (void __user *)childregs->rsi;
if (copy_from_user(&info, cp, sizeof(info))) if (copy_from_user(&info, cp, sizeof(info)))
return -EFAULT; return -EFAULT;
if (LDT_empty(&info)) if (LDT_empty(&info))
return -EINVAL; return -EINVAL;
idx = info.entry_number; idx = info.entry_number;
if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
return -EINVAL; return -EINVAL;
desc = (struct n_desc_struct *)(p->thread.tls_array) + idx - GDT_ENTRY_TLS_MIN; desc = (struct n_desc_struct *)(p->thread.tls_array) + idx - GDT_ENTRY_TLS_MIN;
desc->a = LDT_entry_a(&info); desc->a = LDT_entry_a(&info);
desc->b = LDT_entry_b(&info); desc->b = LDT_entry_b(&info);