1 files changed, 10 insertions, 9 deletions

diff --git a/arch/x86/kernel/vsyscall_64.c b/arch/x86/kernel/vsyscall_64.c
index 61efa2f7d564..0b8b6690a86d 100644
--- a/arch/x86/kernel/vsyscall_64.c
+++ b/arch/x86/kernel/vsyscall_64.c
@@ -42,7 +42,8 @@
 #include <asm/topology.h>
 #include <asm/vgtod.h>
 
-#define __vsyscall(nr) __attribute__ ((unused,__section__(".vsyscall_" #nr)))
+#define __vsyscall(nr) \
+                __attribute__ ((unused, __section__(".vsyscall_" #nr))) notrace
 #define __syscall_clobber "r11","cx","memory"
 
 /*
@@ -249,7 +250,7 @@ static ctl_table kernel_root_table2[] = {
    doesn't violate that. We'll find out if it does. */
 static void __cpuinit vsyscall_set_cpu(int cpu)
 {
-        unsigned long *d;
+        unsigned long d;
         unsigned long node = 0;
 #ifdef CONFIG_NUMA
         node = cpu_to_node(cpu);
@@ -260,11 +261,11 @@ 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 *)(get_cpu_gdt_table(cpu) + GDT_ENTRY_PER_CPU);
-        *d = 0x0f40000000000ULL;
-        *d |= cpu;
-        *d |= (node & 0xf) << 12;
-        *d |= (node >> 4) << 48;
+        d = 0x0f40000000000ULL;
+        d |= cpu;
+        d |= (node & 0xf) << 12;
+        d |= (node >> 4) << 48;
+        write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_PER_CPU, &d, DESCTYPE_S);
 }
 
 static void __cpuinit cpu_vsyscall_init(void *arg)
@@ -278,7 +279,7 @@ cpu_vsyscall_notifier(struct notifier_block *n, unsigned long action, void *arg)
 {
         long cpu = (long)arg;
         if (action == CPU_ONLINE || action == CPU_ONLINE_FROZEN)
-                smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 0, 1);
+                smp_call_function_single(cpu, cpu_vsyscall_init, NULL, 1);
         return NOTIFY_DONE;
 }
 
@@ -301,7 +302,7 @@ static int __init vsyscall_init(void)
 #ifdef CONFIG_SYSCTL
         register_sysctl_table(kernel_root_table2);
 #endif
-        on_each_cpu(cpu_vsyscall_init, NULL, 0, 1);
+        on_each_cpu(cpu_vsyscall_init, NULL, 1);
         hotcpu_notifier(cpu_vsyscall_notifier, 0);
         return 0;
 }