atomic: use <linux/atomic.h>

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / x86 / kernel / traps.c

diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index b9b67166f9ded16045308aaab63b1f814b59dcfc..9682ec50180c1b732996773bfa4feafa18c6c116 100644 (file)
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -49,7 +49,7 @@
 #include <asm/stacktrace.h>
 #include <asm/processor.h>
 #include <asm/debugreg.h>
-#include <asm/atomic.h>
+#include <linux/atomic.h>
 #include <asm/system.h>
 #include <asm/traps.h>
 #include <asm/desc.h>
@@ -872,6 +872,12 @@ void __init trap_init(void)
        set_bit(SYSCALL_VECTOR, used_vectors);
 #endif
 
+#ifdef CONFIG_X86_64
+       BUG_ON(test_bit(VSYSCALL_EMU_VECTOR, used_vectors));
+       set_system_intr_gate(VSYSCALL_EMU_VECTOR, &emulate_vsyscall);
+       set_bit(VSYSCALL_EMU_VECTOR, used_vectors);
+#endif
+
        /*
         * Should be a barrier for any external CPU state:
         */