From a14d25e3e9ab35a09597189cff62d357738345ea Mon Sep 17 00:00:00 2001 From: Jeremy Fitzhardinge Date: Mon, 16 Mar 2009 17:08:48 -0700 Subject: [PATCH] --- yaml --- r: 145827 b: refs/heads/master c: 5f241e65f2be4661a33e1937e1c829252a80b2b8 h: refs/heads/master i: 145825: b8642bccbd782df33a82580f60e7c32d9402dcba 145823: c51f7e3096e317239ee4225ffcaf8c68fa6f682a 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 93611484f24d..2a76a0db11f4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1e7449730853e7c9ae9a2458b2ced7ba12559a0e +refs/heads/master: 5f241e65f2be4661a33e1937e1c829252a80b2b8 diff --git a/trunk/arch/x86/include/asm/required-features.h b/trunk/arch/x86/include/asm/required-features.h index a4737dddfd58..64cf2d24fad1 100644 --- a/trunk/arch/x86/include/asm/required-features.h +++ b/trunk/arch/x86/include/asm/required-features.h @@ -48,9 +48,15 @@ #endif #ifdef CONFIG_X86_64 +#ifdef CONFIG_PARAVIRT +/* Paravirtualized systems may not have PSE or PGE available */ #define NEED_PSE 0 -#define NEED_MSR (1<<(X86_FEATURE_MSR & 31)) #define NEED_PGE 0 +#else +#define NEED_PSE (1<<(X86_FEATURE_PSE) & 31) +#define NEED_PGE (1<<(X86_FEATURE_PGE) & 31) +#endif +#define NEED_MSR (1<<(X86_FEATURE_MSR & 31)) #define NEED_FXSR (1<<(X86_FEATURE_FXSR & 31)) #define NEED_XMM (1<<(X86_FEATURE_XMM & 31)) #define NEED_XMM2 (1<<(X86_FEATURE_XMM2 & 31))