From f4550c50a59e62dbf2540f7a006541bfd0f0658d Mon Sep 17 00:00:00 2001
From: Venki Pallipadi <venkatesh.pallipadi@intel.com>
Date: Fri, 9 May 2008 13:05:19 -0700
Subject: [PATCH] --- yaml --- r: 96513 b: refs/heads/master c:
 77db9885646f8a88214ea482988d41f8f73630f4 h: refs/heads/master i:   96511:
 38867d6fcc42ab4951ed8554d7f188b5fe2f95ba v: v3

---
 [refs]                    | 2 +-
 trunk/arch/x86/pci/i386.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 02e5e86b4af4..17e78ed2a962 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 439a7733e8fcbaee39979c10246101565834d6b2
+refs/heads/master: 77db9885646f8a88214ea482988d41f8f73630f4
diff --git a/trunk/arch/x86/pci/i386.c b/trunk/arch/x86/pci/i386.c
index 8af0f0bae2af..10fb308fded8 100644
--- a/trunk/arch/x86/pci/i386.c
+++ b/trunk/arch/x86/pci/i386.c
@@ -301,15 +301,13 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 	prot = pgprot_val(vma->vm_page_prot);
 	if (pat_wc_enabled && write_combine)
 		prot |= _PAGE_CACHE_WC;
-	else if (pat_wc_enabled)
+	else if (pat_wc_enabled || boot_cpu_data.x86 > 3)
 		/*
 		 * ioremap() and ioremap_nocache() defaults to UC MINUS for now.
 		 * To avoid attribute conflicts, request UC MINUS here
 		 * aswell.
 		 */
 		prot |= _PAGE_CACHE_UC_MINUS;
-	else if (boot_cpu_data.x86 > 3)
-		prot |= _PAGE_CACHE_UC;
 
 	vma->vm_page_prot = __pgprot(prot);