3 files changed, 3 insertions, 3 deletions

diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c
index 51297cca6b42..05cafcb94109 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 569f1b540e36..279c25775d19 100644
--- a/arch/x86/kernel/suspend_64.c
+++ b/arch/x86/kernel/suspend_64.c
@@ -140,7 +140,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 c4c5e765cd2c..e5c1118a8098 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;