diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-18 10:29:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-18 10:29:54 +0200 |
| commit | 0c2364791343e4b04cd1f097ff2abc2799062448 (patch) | |
| tree | beb9d94252d42d35b2066bf23383576b0beeebeb /arch/x86/include/asm/processor.h | |
| parent | e26f34a407aec9c65bce2bc0c838fabe4f051fc6 (diff) | |
| parent | aa5d1b81500e6059190f18fe25a7617682321910 (diff) | |
| download | linux-0c2364791343e4b04cd1f097ff2abc2799062448.tar.gz linux-0c2364791343e4b04cd1f097ff2abc2799062448.tar.bz2 linux-0c2364791343e4b04cd1f097ff2abc2799062448.zip | |
Merge branch 'x86/asm' into locking/core
We need the ASM_UNREACHABLE() macro for a dependent patch.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/processor.h')
| -rw-r--r-- | arch/x86/include/asm/processor.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index 028245e1c42b..0b03d655db7c 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> @@ -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 |