diff options
| author | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:09:27 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2019-11-25 09:09:27 +0100 |
| commit | ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6 (patch) | |
| tree | dce8c1a21347cd12b44ed56af4aafc2a58c9ec08 /arch/x86/include/asm/xen/interface.h | |
| parent | c494cd6469ab0f4bdd663d1a2d396b0ec2f42103 (diff) | |
| parent | 004e8dce9c5595697951f7cd0e9f66b35c92265e (diff) | |
| download | talos-op-linux-ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6.tar.gz talos-op-linux-ceb9e77324fa661b1001a0ae66f061b5fcb4e4e6.zip | |
Merge branch 'x86/core' into perf/core, to resolve conflicts and to pick up completed topic tree
Conflicts:
tools/perf/check-headers.sh
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/xen/interface.h')
| -rw-r--r-- | arch/x86/include/asm/xen/interface.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/x86/include/asm/xen/interface.h b/arch/x86/include/asm/xen/interface.h index 62ca03ef5c65..9139b3e86316 100644 --- a/arch/x86/include/asm/xen/interface.h +++ b/arch/x86/include/asm/xen/interface.h @@ -379,12 +379,9 @@ struct xen_pmu_arch { * Prefix forces emulation of some non-trapping instructions. * Currently only CPUID. */ -#ifdef __ASSEMBLY__ -#define XEN_EMULATE_PREFIX .byte 0x0f,0x0b,0x78,0x65,0x6e ; -#define XEN_CPUID XEN_EMULATE_PREFIX cpuid -#else -#define XEN_EMULATE_PREFIX ".byte 0x0f,0x0b,0x78,0x65,0x6e ; " -#define XEN_CPUID XEN_EMULATE_PREFIX "cpuid" -#endif +#include <asm/emulate_prefix.h> + +#define XEN_EMULATE_PREFIX __ASM_FORM(.byte __XEN_EMULATE_PREFIX ;) +#define XEN_CPUID XEN_EMULATE_PREFIX __ASM_FORM(cpuid) #endif /* _ASM_X86_XEN_INTERFACE_H */ |
