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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86-fixes3: (21 commits)
  x86: numaq fix
  x86: 8K stacks by default
  x86: ioremap ram check fix
  x86: fix HT cpu booting on 32-bit
  x86: optimize inlining off
  x86: CONFIG_X86_ELAN fix
  x86: Kconfig fix
  x86 PAT: fix performance drop for glx, use UC minus for ioremap(), ioremap_nocache() and pci_mmap_page_range()
  x86: use defconfigs from x86/configs/*
  toshiba: use ioremap_cached
  revert: "x86: ioremap(), extend check to all RAM pages"
  x86: don't bother printing compat vdso address
  fix: x86: support for new UV apic
  x86: fix early-BUG message
  x86: iommu_sac_force can become static
  x86: add proper header for reboot_force
  x86 VISWS: build fix
  x86, voyager: fix ioremap_nocache()
  hpet: fix
  x86: unexport kmap_atomic_to_page
  ...

1 files changed, 9 insertions, 3 deletions

diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 94f6c73a53d0..8af0f0bae2af 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -301,6 +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)
+                /*
+                 * 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;
 
@@ -319,9 +326,8 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
                  * - request is uncached, return cannot be write-combine
                  * - request is write-combine, return cannot be write-back
                  */
-                if ((flags == _PAGE_CACHE_UC &&
-                     (new_flags == _PAGE_CACHE_WB ||
-                      new_flags == _PAGE_CACHE_WC)) ||
+                if ((flags == _PAGE_CACHE_UC_MINUS &&
+                     (new_flags == _PAGE_CACHE_WB)) ||
                     (flags == _PAGE_CACHE_WC &&
                      new_flags == _PAGE_CACHE_WB)) {
                         free_memtype(addr, addr+len);