diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-09 11:39:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-09 11:39:02 +0200 |
| commit | d028203c0446c7f65ed2b22342a56f03c6c4a6c1 (patch) | |
| tree | 6bd73a5c70b407491dc9d40ecb9e95b48233d004 /arch/x86/pci/i386.c | |
| parent | f57e91682d141ea50d8c6d42cdc251b6256a3755 (diff) | |
| parent | 183fe065652dbd64953afa9f389327e23e97967f (diff) | |
Merge branch 'x86/core' into x86/unify-pci
Diffstat (limited to 'arch/x86/pci/i386.c')
| -rw-r--r-- | arch/x86/pci/i386.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c index 10fb308fded8..6ccd7a108cd4 100644 --- a/arch/x86/pci/i386.c +++ b/arch/x86/pci/i386.c @@ -299,9 +299,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, return -EINVAL; prot = pgprot_val(vma->vm_page_prot); - if (pat_wc_enabled && write_combine) + if (pat_enabled && write_combine) prot |= _PAGE_CACHE_WC; - else if (pat_wc_enabled || boot_cpu_data.x86 > 3) + else if (pat_enabled || boot_cpu_data.x86 > 3) /* * ioremap() and ioremap_nocache() defaults to UC MINUS for now. * To avoid attribute conflicts, request UC MINUS here |