diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-03-16 09:01:55 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-03-16 09:01:55 +0100 |
| commit | ba4e06d68ea4fd2be401d7226c68941892d6bbaf (patch) | |
| tree | a9a7125a8c88ba543e4fcfb907869b97688dee3c /arch/x86/include/asm/mwait.h | |
| parent | 743146db071c4a828159211a295d12ff4f61752f (diff) | |
| parent | 710d60cbf1b312a8075a2158cbfbbd9c66132dcc (diff) | |
| download | talos-op-linux-ba4e06d68ea4fd2be401d7226c68941892d6bbaf.tar.gz talos-op-linux-ba4e06d68ea4fd2be401d7226c68941892d6bbaf.zip | |
Merge branch 'linus' into x86/urgent, to pick up dependencies for a fix
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/mwait.h')
| -rw-r--r-- | arch/x86/include/asm/mwait.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/mwait.h b/arch/x86/include/asm/mwait.h index c70689b5e5aa..0deeb2d26df7 100644 --- a/arch/x86/include/asm/mwait.h +++ b/arch/x86/include/asm/mwait.h @@ -3,6 +3,8 @@ #include <linux/sched.h> +#include <asm/cpufeature.h> + #define MWAIT_SUBSTATE_MASK 0xf #define MWAIT_CSTATE_MASK 0xf #define MWAIT_SUBSTATE_SIZE 4 |
