Description of problem: 
compilation error with recent patch for BZ703055 

Version-Release number of selected component (if applicable):
2.6.32-131.6.1

How reproducible:
"CONFIG_XEN is not set" in configuration file

Steps to Reproduce:
1. rpmbuild -bb kernel.spec
2.
3.
  
Actual results:
arch/x86/kernel/cpu/common.c: In function 'filter_cpuid_features':
> arch/x86/kernel/cpu/common.c:306: error: implicit declaration of function
> 'xen_cpuid_base'

Expected results:
build OK

Additional info:

Compilation is OK with the following patch:
--- k/arch/x86/kernel/cpu/common.c~	2011-06-20 19:27:06.000000000 +0200
+++ k/arch/x86/kernel/cpu/common.c	2011-07-18 10:55:46.000000000 +0200
@@ -301,7 +301,7 @@ static void __cpuinit filter_cpuid_featu
 		       "CPU: CPU feature %s disabled, no CPUID level 0x%x\n",
 				x86_cap_flags[df->feature], df->level);
 	}
-
+#ifdef CONFIG_XEN
 	/* RHEL Xen HVM guests must filter additional features. BZ#703055 */
 	if (xen_cpuid_base() == 0)
 		return;
@@ -318,6 +318,7 @@ static void __cpuinit filter_cpuid_featu
 
 	clear_cpu_cap(c, X86_FEATURE_GBPAGES);
 	clear_cpu_cap(c, X86_FEATURE_RDTSCP);
+#endif /* CONFIG_XEN */
 }