From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Sep 2015 17:07:40 +0000 (-0700)
Subject: Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.3-rc1~127
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=25525bea46e7d5bc1f82cbc12de2f27b9c346a92;p=uclinux-h8%2Flinux.git

Merge branch 'x86-mm-for-linus' of git://git./linux/kernel/git/tip/tip

Pull x86 mm updates from Ingo Molnar:
 "The dominant change in this cycle was the continued work to isolate
  kernel drivers from MTRR legacies: this tree gets rid of all kernel
  internal driver interfaces to MTRRs (mostly by rewriting it to proper
  PAT interfaces), the only access left is the /proc/mtrr ABI.

  This work was done by Luis R Rodriguez.

  There's also some related PCI interface additions for which I've
  Cc:-ed Bjorn"

* 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
  x86/mm/mtrr: Remove kernel internal MTRR interfaces: unexport mtrr_add() and mtrr_del()
  s390/io: Add pci_iomap_wc() and pci_iomap_wc_range()
  drivers/dma/iop-adma: Use dma_alloc_writecombine() kernel-style
  drivers/video/fbdev/vt8623fb: Use arch_phys_wc_add() and pci_iomap_wc()
  drivers/video/fbdev/s3fb: Use arch_phys_wc_add() and pci_iomap_wc()
  drivers/video/fbdev/arkfb.c: Use arch_phys_wc_add() and pci_iomap_wc()
  PCI: Add pci_iomap_wc() variants
  drivers/video/fbdev/gxt4500: Use pci_ioremap_wc_bar() to map framebuffer
  drivers/video/fbdev/kyrofb: Use arch_phys_wc_add() and pci_ioremap_wc_bar()
  drivers/video/fbdev/i740fb: Use arch_phys_wc_add() and pci_ioremap_wc_bar()
  PCI: Add pci_ioremap_wc_bar()
  x86/mm: Make kernel/check.c explicitly non-modular
  x86/mm/pat: Make mm/pageattr[-test].c explicitly non-modular
  x86/mm/pat: Add comments to cachemode translation tables
  arch/*/io.h: Add ioremap_uc() to all architectures
  drivers/video/fbdev/atyfb: Use arch_phys_wc_add() and ioremap_wc()
  drivers/video/fbdev/atyfb: Replace MTRR UC hole with strong UC
  drivers/video/fbdev/atyfb: Clarify ioremap() base and length used
  drivers/video/fbdev/atyfb: Carve out framebuffer length fudging into a helper
  x86/mm, asm-generic: Add IOMMU ioremap_uc() variant default
  ...
---

25525bea46e7d5bc1f82cbc12de2f27b9c346a92
diff --cc drivers/pci/pci.c
index cc76238c86fb,fdae37b473f8..6a9a1116f1eb
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@@ -138,8 -138,23 +138,22 @@@ void __iomem *pci_ioremap_bar(struct pc
  	return ioremap_nocache(res->start, resource_size(res));
  }
  EXPORT_SYMBOL_GPL(pci_ioremap_bar);
+ 
+ void __iomem *pci_ioremap_wc_bar(struct pci_dev *pdev, int bar)
+ {
+ 	/*
+ 	 * Make sure the BAR is actually a memory resource, not an IO resource
+ 	 */
+ 	if (!(pci_resource_flags(pdev, bar) & IORESOURCE_MEM)) {
+ 		WARN_ON(1);
+ 		return NULL;
+ 	}
+ 	return ioremap_wc(pci_resource_start(pdev, bar),
+ 			  pci_resource_len(pdev, bar));
+ }
+ EXPORT_SYMBOL_GPL(pci_ioremap_wc_bar);
  #endif
  
 -#define PCI_FIND_CAP_TTL	48
  
  static int __pci_find_next_cap_ttl(struct pci_bus *bus, unsigned int devfn,
  				   u8 pos, int cap, int *ttl)