lkml.org 
[lkml]   [2007]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 15/19] use the same data type for tls_array.
    Date
    This patch changes the type of tls_array in x86_64 to
    a desc_struct. Now, both i386 and x86_64 tls_array have
    the same type, and code accessing it can be shared.

    Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
    ---
    include/asm-x86/desc_64.h | 2 +-
    include/asm-x86/processor_64.h | 3 ++-
    2 files changed, 3 insertions(+), 2 deletions(-)

    diff --git a/include/asm-x86/desc_64.h b/include/asm-x86/desc_64.h
    index 2dc19e2..7fd9876 100644
    --- a/include/asm-x86/desc_64.h
    +++ b/include/asm-x86/desc_64.h
    @@ -150,7 +150,7 @@ static inline void set_ldt(void *addr, int entries)
    static inline void load_TLS(struct thread_struct *t, unsigned int cpu)
    {
    unsigned int i;
    - u64 *gdt = (u64 *)(get_cpu_gdt_table(cpu) + GDT_ENTRY_TLS_MIN);
    + struct desc_struct *gdt = (get_cpu_gdt_table(cpu) + GDT_ENTRY_TLS_MIN);

    for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
    gdt[i] = t->tls_array[i];
    diff --git a/include/asm-x86/processor_64.h b/include/asm-x86/processor_64.h
    index 8efdf99..51f1970 100644
    --- a/include/asm-x86/processor_64.h
    +++ b/include/asm-x86/processor_64.h
    @@ -19,6 +19,7 @@
    #include <linux/personality.h>
    #include <linux/cpumask.h>
    #include <asm/processor-flags.h>
    +#include <asm/desc_defs.h>

    #define TF_MASK 0x00000100
    #define IF_MASK 0x00000200
    @@ -244,7 +245,7 @@ struct thread_struct {
    * goes into MSR_IA32_DS_AREA */
    unsigned long ds_area_msr;
    /* cached TLS descriptors. */
    - u64 tls_array[GDT_ENTRY_TLS_ENTRIES];
    + struct desc_struct tls_array[GDT_ENTRY_TLS_ENTRIES];
    } __attribute__((aligned(16)));

    #define INIT_THREAD { \
    --
    1.5.0.6


    \
     
     \ /
      Last update: 2007-12-13 05:51    [W:0.028 / U:119.356 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site