Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86 setup: fix asm constraints in vesa_store_edid
  xen: make sysfs files behave as their names suggest
  x86: tone down mtrr_trim_uncached_memory() warning
  x86: correct the CPUID pattern for MSR_IA32_MISC_ENABLE availability

3 files changed, 7 insertions, 9 deletions

diff --git a/arch/x86/boot/video-vesa.c b/arch/x86/boot/video-vesa.c
index 75115849af33..4a58c8ce3f69 100644
--- a/arch/x86/boot/video-vesa.c
+++ b/arch/x86/boot/video-vesa.c
@@ -269,9 +269,8 @@ void vesa_store_edid(void)
            we genuinely have to assume all registers are destroyed here. */
 
         asm("pushw %%es; movw %2,%%es; "INT10"; popw %%es"
-            : "+a" (ax), "+b" (bx)
-            :  "c" (cx), "D" (di)
-            : "esi");
+            : "+a" (ax), "+b" (bx), "+c" (cx), "+D" (di)
+            : : "esi", "edx");
 
         if (ax != 0x004f)
                 return;         /* No EDID */
@@ -285,9 +284,9 @@ void vesa_store_edid(void)
         dx = 0;                 /* EDID block number */
         di =(size_t) &boot_params.edid_info; /* (ES:)Pointer to block */
         asm(INT10
-            : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info)
-            : "c" (cx), "D" (di)
-            : "esi");
+            : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info),
+              "+c" (cx), "+D" (di)
+            : : "esi");
 #endif /* CONFIG_FIRMWARE_EDID */
 }
 
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c
index 549f2ada55f5..430e5c38a544 100644
--- a/arch/x86/kernel/cpu/intel.c
+++ b/arch/x86/kernel/cpu/intel.c
@@ -30,7 +30,7 @@
 static void __cpuinit early_init_intel(struct cpuinfo_x86 *c)
 {
         /* Unmask CPUID levels if masked: */
-        if (c->x86 == 6 && c->x86_model >= 15) {
+        if (c->x86 > 6 || (c->x86 == 6 && c->x86_model >= 0xd)) {
                 u64 misc_enable;
 
                 rdmsrl(MSR_IA32_MISC_ENABLE, misc_enable);
diff --git a/arch/x86/kernel/cpu/mtrr/main.c b/arch/x86/kernel/cpu/mtrr/main.c
index d259e5d2e054..236a401b8259 100644
--- a/arch/x86/kernel/cpu/mtrr/main.c
+++ b/arch/x86/kernel/cpu/mtrr/main.c
@@ -1594,8 +1594,7 @@ int __init mtrr_trim_uncached_memory(unsigned long end_pfn)
 
         /* kvm/qemu doesn't have mtrr set right, don't trim them all */
         if (!highest_pfn) {
-                WARN(!kvm_para_available(), KERN_WARNING
-                                "WARNING: strange, CPU MTRRs all blank?\n");
+                printk(KERN_INFO "CPU MTRRs all blank - virtualized system.\n");
                 return 0;
         }