Merge branch develop-3.10-next

[firefly-linux-kernel-4.4.55.git] / arch / x86 / include / asm / vsyscall.h

diff --git a/arch/x86/include/asm/vsyscall.h b/arch/x86/include/asm/vsyscall.h
index 2a46ca720afca5fd6f5e5010698e8eea56748837..2874be9aef0ae7f19efec928c66a4bb0394e0311 100644 (file)
--- a/arch/x86/include/asm/vsyscall.h
+++ b/arch/x86/include/asm/vsyscall.h
@@ -34,7 +34,7 @@ static inline unsigned int __getcpu(void)
                native_read_tscp(&p);
        } else {
                /* Load per CPU data from GDT */
-               asm("lsl %1,%0" : "=r" (p) : "r" (__PER_CPU_SEG));
+               asm volatile ("lsl %1,%0" : "=r" (p) : "r" (__PER_CPU_SEG));
        }
 
        return p;