diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-08-10 13:14:15 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-08-10 13:14:15 +0200 |
| commit | 1d0f49e14007a5426eb7e9e5808168cdb77b3e7f (patch) | |
| tree | 1d7eb036e06938dedb7488910e4d34dc4c73fa68 /arch/x86/entry | |
| parent | 99504819fc643160afd6813921b1d42b18e52a49 (diff) | |
| parent | e93c17301ac55321fc18e0f8316e924e58a83c8c (diff) | |
| download | blackbird-op-linux-1d0f49e14007a5426eb7e9e5808168cdb77b3e7f.tar.gz blackbird-op-linux-1d0f49e14007a5426eb7e9e5808168cdb77b3e7f.zip | |
Merge branch 'x86/urgent' into x86/asm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/entry')
| -rw-r--r-- | arch/x86/entry/entry_64.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index aa58155187c5..64b233ab7cad 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -796,6 +796,7 @@ apicinterrupt X86_PLATFORM_IPI_VECTOR x86_platform_ipi smp_x86_platform_ipi #ifdef CONFIG_HAVE_KVM apicinterrupt3 POSTED_INTR_VECTOR kvm_posted_intr_ipi smp_kvm_posted_intr_ipi apicinterrupt3 POSTED_INTR_WAKEUP_VECTOR kvm_posted_intr_wakeup_ipi smp_kvm_posted_intr_wakeup_ipi +apicinterrupt3 POSTED_INTR_NESTED_VECTOR kvm_posted_intr_nested_ipi smp_kvm_posted_intr_nested_ipi #endif #ifdef CONFIG_X86_MCE_THRESHOLD @@ -1312,6 +1313,8 @@ ENTRY(nmi) * other IST entries. */ + ASM_CLAC + /* Use %rdx as our temp variable throughout */ pushq %rdx |
