diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2024-01-02 11:03:04 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2024-01-02 11:03:04 -0800 |
| commit | 11c83932028714014e4259072bd230473d6db730 (patch) | |
| tree | ba5de3af7a65a6a60ebb1f0a36328fd853130ecd /arch/x86/xen/xen-asm.S | |
| parent | 58f1e9d3a30438042fc9ed65b3dc56b2e5f7886a (diff) | |
| parent | 185c1a489f873cb71520fc089401e02dbf302dcd (diff) | |
Merge branch 'for-6.8/cxl-cdat' into for-6.8/cxl
Pick up the CDAT parsing and QOS class infrastructure for v6.8.
Diffstat (limited to 'arch/x86/xen/xen-asm.S')
| -rw-r--r-- | arch/x86/xen/xen-asm.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S index 9e5e68008785..1a9cd18dfbd3 100644 --- a/arch/x86/xen/xen-asm.S +++ b/arch/x86/xen/xen-asm.S @@ -156,7 +156,7 @@ xen_pv_trap asm_xenpv_exc_machine_check #endif /* CONFIG_X86_MCE */ xen_pv_trap asm_exc_simd_coprocessor_error #ifdef CONFIG_IA32_EMULATION -xen_pv_trap entry_INT80_compat +xen_pv_trap asm_int80_emulation #endif xen_pv_trap asm_exc_xen_unknown_trap xen_pv_trap asm_exc_xen_hypervisor_callback |