diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-08-25 08:56:22 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-08-25 08:56:22 +0200 |
| commit | c0bb80cfa3c37fd92f066e328d83656067519a5f (patch) | |
| tree | fad29579615daaf7d36364e4b45702db0c709044 /arch/x86/include/asm/processor.h | |
| parent | adfaf18334cbf16c563e4ebc67e968ea1b17ec51 (diff) | |
| parent | ecda85e70277ef24e44a1f6bc00243cebd19f985 (diff) | |
| download | linux-c0bb80cfa3c37fd92f066e328d83656067519a5f.tar.gz linux-c0bb80cfa3c37fd92f066e328d83656067519a5f.tar.bz2 linux-c0bb80cfa3c37fd92f066e328d83656067519a5f.zip | |
Merge branch 'x86/asm' into x86/apic
Pick up dependent changes to avoid merge conflicts
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 028245e1c42b..abc99b9c7ffd 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h @@ -22,6 +22,7 @@ struct vm86; #include <asm/nops.h> #include <asm/special_insns.h> #include <asm/fpu/types.h> +#include <asm/unwind_hints.h> #include <linux/personality.h> #include <linux/cache.h> @@ -661,7 +662,7 @@ static inline void sync_core(void) * In case NMI unmasking or performance ever becomes a problem, * the next best option appears to be MOV-to-CR2 and an * unconditional jump. That sequence also works on all CPUs, - * but it will fault at CPL3 (i.e. Xen PV and lguest). + * but it will fault at CPL3 (i.e. Xen PV). * * CPUID is the conventional way, but it's nasty: it doesn't * exist on some 486-like CPUs, and it usually exits to a @@ -684,6 +685,7 @@ static inline void sync_core(void) unsigned int tmp; asm volatile ( + UNWIND_HINT_SAVE "mov %%ss, %0\n\t" "pushq %q0\n\t" "pushq %%rsp\n\t" @@ -693,6 +695,7 @@ static inline void sync_core(void) "pushq %q0\n\t" "pushq $1f\n\t" "iretq\n\t" + UNWIND_HINT_RESTORE "1:" : "=&r" (tmp), "+r" (__sp) : : "cc", "memory"); #endif |