lkml.org 
[lkml]   [2007]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3/19] change gdt acessor macro name
    Date
    This patch changes the name of x86_64 macro used to access the per-cpu
    gdt. It is now equal to the i386 version, which will allow code to be shared.

    Signed-off-by: Glauber de Oliveira Costa <gcosta@redhat.com>
    ---
    arch/x86/kernel/setup64.c | 2 +-
    arch/x86/kernel/suspend_64.c | 2 +-
    arch/x86/kernel/vsyscall_64.c | 2 +-
    include/asm-x86/desc_64.h | 10 +++++-----
    4 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c
    index 51297cc..05cafcb 100644
    --- a/arch/x86/kernel/setup64.c
    +++ b/arch/x86/kernel/setup64.c
    @@ -228,7 +228,7 @@ void __cpuinit cpu_init (void)
    * and set up the GDT descriptor:
    */
    if (cpu)
    - memcpy(cpu_gdt(cpu), cpu_gdt_table, GDT_SIZE);
    + memcpy(get_cpu_gdt_table(cpu), cpu_gdt_table, GDT_SIZE);

    cpu_gdt_descr[cpu].size = GDT_SIZE;
    load_gdt((const struct desc_ptr *)&cpu_gdt_descr[cpu]);
    diff --git a/arch/x86/kernel/suspend_64.c b/arch/x86/kernel/suspend_64.c
    index c58ca08..54eca46 100644
    --- a/arch/x86/kernel/suspend_64.c
    +++ b/arch/x86/kernel/suspend_64.c
    @@ -118,7 +118,7 @@ void fix_processor_context(void)

    set_tss_desc(cpu,t); /* This just modifies memory; should not be necessary. But... This is necessary, because 386 hardware has concept of busy TSS or some similar stupidity. */

    - cpu_gdt(cpu)[GDT_ENTRY_TSS].type = 9;
    + get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS].type = 9;

    syscall_init(); /* This sets MSR_*STAR and related */
    load_TR_desc(); /* This does ltr */
    diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
    index c4c5e76..e5c1118 100644
    --- a/arch/x86/kernel/vsyscall_64.c
    +++ b/arch/x86/kernel/vsyscall_64.c
    @@ -297,7 +297,7 @@ static void __cpuinit vsyscall_set_cpu(int cpu)
    /* Store cpu number in limit so that it can be loaded quickly
    in user space in vgetcpu.
    12 bits for the CPU and 8 bits for the node. */
    - d = (unsigned long *)(cpu_gdt(cpu) + GDT_ENTRY_PER_CPU);
    + d = (unsigned long *)(get_cpu_gdt_table(cpu) + GDT_ENTRY_PER_CPU);
    *d = 0x0f40000000000ULL;
    *d |= cpu;
    *d |= (node & 0xf) << 12;
    diff --git a/include/asm-x86/desc_64.h b/include/asm-x86/desc_64.h
    index 230ac6e..1c26dbb 100644
    --- a/include/asm-x86/desc_64.h
    +++ b/include/asm-x86/desc_64.h
    @@ -48,7 +48,7 @@ static inline void write_ldt_entry(struct desc_struct *ldt,
    }

    /* the cpu gdt accessor */
    -#define cpu_gdt(_cpu) ((struct desc_struct *)cpu_gdt_descr[_cpu].address)
    +#define get_cpu_gdt_table(_cpu) ((struct desc_struct *)cpu_gdt_descr[_cpu].address)

    static inline void load_gdt(const struct desc_ptr *ptr)
    {
    @@ -141,15 +141,15 @@ static inline void set_tss_desc(unsigned cpu, void *addr)
    * -1? seg base+limit should be pointing to the address of the
    * last valid byte
    */
    - set_tssldt_descriptor(&cpu_gdt(cpu)[GDT_ENTRY_TSS],
    + set_tssldt_descriptor(&get_cpu_gdt_table(cpu)[GDT_ENTRY_TSS],
    (unsigned long)addr, DESC_TSS,
    IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1);
    }

    static inline void set_ldt_desc(unsigned cpu, void *addr, int size)
    {
    - set_tssldt_descriptor(&cpu_gdt(cpu)[GDT_ENTRY_LDT], (unsigned long)addr,
    - DESC_LDT, size * 8 - 1);
    + set_tssldt_descriptor(&get_cpu_gdt_table(cpu)[GDT_ENTRY_LDT],
    + (unsigned long)addr, DESC_LDT, size * 8 - 1);
    }

    #define LDT_entry_a(info) \
    @@ -183,7 +183,7 @@ static inline void set_ldt_desc(unsigned cpu, void *addr, int size)
    static inline void load_TLS(struct thread_struct *t, unsigned int cpu)
    {
    unsigned int i;
    - u64 *gdt = (u64 *)(cpu_gdt(cpu) + GDT_ENTRY_TLS_MIN);
    + u64 *gdt = (u64 *)(get_cpu_gdt_table(cpu) + GDT_ENTRY_TLS_MIN);

    for (i = 0; i < GDT_ENTRY_TLS_ENTRIES; i++)
    gdt[i] = t->tls_array[i];
    --
    1.4.4.2


    \
     
     \ /
      Last update: 2007-12-06 20:15    [W:0.024 / U:62.100 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site