From 3fb87c514f4213b7a561ba10410ea89bd6699976 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Mon, 28 Jan 2013 17:49:50 +0000 Subject: [PATCH] --- yaml --- r: 350212 b: refs/heads/master c: 2b9b6d8c715b23fa119261c32ad360681f4464a9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/required-features.h | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3360c644e45a..2f76d99a1a27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 83a57a4de1a222c351667ef9a0fedaac1295e85b +refs/heads/master: 2b9b6d8c715b23fa119261c32ad360681f4464a9 diff --git a/trunk/arch/x86/include/asm/required-features.h b/trunk/arch/x86/include/asm/required-features.h index 6c7fc25f2c34..5c6e4fb370f5 100644 --- a/trunk/arch/x86/include/asm/required-features.h +++ b/trunk/arch/x86/include/asm/required-features.h @@ -47,6 +47,12 @@ # define NEED_NOPL 0 #endif +#ifdef CONFIG_MATOM +# define NEED_MOVBE (1<<(X86_FEATURE_MOVBE & 31)) +#else +# define NEED_MOVBE 0 +#endif + #ifdef CONFIG_X86_64 #ifdef CONFIG_PARAVIRT /* Paravirtualized systems may not have PSE or PGE available */ @@ -80,7 +86,7 @@ #define REQUIRED_MASK2 0 #define REQUIRED_MASK3 (NEED_NOPL) -#define REQUIRED_MASK4 0 +#define REQUIRED_MASK4 (NEED_MOVBE) #define REQUIRED_MASK5 0 #define REQUIRED_MASK6 0 #define REQUIRED_MASK7 0