diff options
| author | Linus Torvalds | 2019-07-09 02:49:45 +0200 |
|---|---|---|
| committer | Linus Torvalds | 2019-07-09 02:49:45 +0200 |
| commit | 8faef7125d02c0bbd7a1ceb4e3b599a9b8c42e58 (patch) | |
| tree | 5d6c28a0f5654b5bae84e65dbb5563049b7b497e /arch/x86/entry | |
| parent | Merge branch 'x86-paravirt-for-linus' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | x86/jailhouse: Mark jailhouse_x2apic_available() as __init (diff) | |
| download | kernel-qcow2-linux-8faef7125d02c0bbd7a1ceb4e3b599a9b8c42e58.tar.gz kernel-qcow2-linux-8faef7125d02c0bbd7a1ceb4e3b599a9b8c42e58.tar.xz kernel-qcow2-linux-8faef7125d02c0bbd7a1ceb4e3b599a9b8c42e58.zip | |
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 platform updayes from Ingo Molnar:
"Most of the commits add ACRN hypervisor guest support, plus two
cleanups"
* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/jailhouse: Mark jailhouse_x2apic_available() as __init
x86/platform/geode: Drop <linux/gpio.h> includes
x86/acrn: Use HYPERVISOR_CALLBACK_VECTOR for ACRN guest upcall vector
x86: Add support for Linux guests on an ACRN hypervisor
x86/Kconfig: Add new X86_HV_CALLBACK_VECTOR config symbol
Diffstat (limited to 'arch/x86/entry')
| -rw-r--r-- | arch/x86/entry/entry_64.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index 15f0749d0a15..a829dd3117d0 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -1164,6 +1164,11 @@ apicinterrupt3 HYPERV_STIMER0_VECTOR \ hv_stimer0_callback_vector hv_stimer0_vector_handler #endif /* CONFIG_HYPERV */ +#if IS_ENABLED(CONFIG_ACRN_GUEST) +apicinterrupt3 HYPERVISOR_CALLBACK_VECTOR \ + acrn_hv_callback_vector acrn_hv_vector_handler +#endif + idtentry debug do_debug has_error_code=0 paranoid=1 shift_ist=IST_INDEX_DB ist_offset=DB_STACK_OFFSET idtentry int3 do_int3 has_error_code=0 create_gap=1 idtentry stack_segment do_stack_segment has_error_code=1 |