From 5df4fe36c1b0361c12920651eaf3628422197f21 Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Wed, 20 Dec 2017 11:52:15 +0000 Subject: [PATCH] x86/nops: Switch to the P6 nops as a compile-time default Along with c/s d7128e735031 switching the runtime choice of best nops, switch the compile-time default to P6 nops. This is more efficient on most processors for alternative points which add/remove code, rather than switch between two different pieces of code. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- xen/include/asm-x86/nops.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/xen/include/asm-x86/nops.h b/xen/include/asm-x86/nops.h index dda9d202c8..1a46b97aff 100644 --- a/xen/include/asm-x86/nops.h +++ b/xen/include/asm-x86/nops.h @@ -55,15 +55,15 @@ #define _ASM_MK_NOP(x) ".byte " __stringify(x) "\n" #endif -#define ASM_NOP1 _ASM_MK_NOP(K8_NOP1) -#define ASM_NOP2 _ASM_MK_NOP(K8_NOP2) -#define ASM_NOP3 _ASM_MK_NOP(K8_NOP3) -#define ASM_NOP4 _ASM_MK_NOP(K8_NOP4) -#define ASM_NOP5 _ASM_MK_NOP(K8_NOP5) -#define ASM_NOP6 _ASM_MK_NOP(K8_NOP6) -#define ASM_NOP7 _ASM_MK_NOP(K8_NOP7) -#define ASM_NOP8 _ASM_MK_NOP(K8_NOP8) -#define ASM_NOP9 _ASM_MK_NOP(K8_NOP9) +#define ASM_NOP1 _ASM_MK_NOP(P6_NOP1) +#define ASM_NOP2 _ASM_MK_NOP(P6_NOP2) +#define ASM_NOP3 _ASM_MK_NOP(P6_NOP3) +#define ASM_NOP4 _ASM_MK_NOP(P6_NOP4) +#define ASM_NOP5 _ASM_MK_NOP(P6_NOP5) +#define ASM_NOP6 _ASM_MK_NOP(P6_NOP6) +#define ASM_NOP7 _ASM_MK_NOP(P6_NOP7) +#define ASM_NOP8 _ASM_MK_NOP(P6_NOP8) +#define ASM_NOP9 _ASM_MK_NOP(P6_NOP9) #define ASM_NOP_MAX 9 -- 2.30.2