From fb5ebe04d58ac2f5d6151bdd0b6162f723bc2308 Mon Sep 17 00:00:00 2001 From: Jeff Dike Date: Sun, 6 May 2007 14:51:20 -0700 Subject: [PATCH] --- yaml --- r: 54301 b: refs/heads/master c: 65a58ab044308ae65ca06c50fb10be5e0e080989 h: refs/heads/master i: 54299: cc3ff3f642c3f9ac07d861774a1efa746b9c95da v: v3 --- [refs] | 2 +- trunk/arch/um/sys-i386/tls.c | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index ea9db0040195..562eaccde235 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a18ff1bde0c3da9ece3ba60e6eae2ef87f91a12e +refs/heads/master: 65a58ab044308ae65ca06c50fb10be5e0e080989 diff --git a/trunk/arch/um/sys-i386/tls.c b/trunk/arch/um/sys-i386/tls.c index 643dab585727..fea8e5e15cc4 100644 --- a/trunk/arch/um/sys-i386/tls.c +++ b/trunk/arch/um/sys-i386/tls.c @@ -23,9 +23,13 @@ #include "skas.h" #endif -/* If needed we can detect when it's uninitialized. */ +/* + * If needed we can detect when it's uninitialized. + * + * These are initialized in an initcall and unchanged thereafter. + */ static int host_supports_tls = -1; -int host_gdt_entry_tls_min = -1; +int host_gdt_entry_tls_min; #ifdef CONFIG_MODE_SKAS int do_set_thread_area_skas(struct user_desc *info) @@ -361,7 +365,8 @@ int ptrace_get_thread_area(struct task_struct *child, int idx, /* XXX: This part is probably common to i386 and x86-64. Don't create a common * file for now, do that when implementing x86-64 support.*/ -static int __init __setup_host_supports_tls(void) { +static int __init __setup_host_supports_tls(void) +{ check_host_supports_tls(&host_supports_tls, &host_gdt_entry_tls_min); if (host_supports_tls) { printk(KERN_INFO "Host TLS support detected\n");