Commit 75befb31 authored Jun 23, 2016 by Linus Torvalds

Merge tag 'pci-v4.7-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

Pull PCI fix from Bjorn Helgaas:
 "Here's a small fix for v4.7.  This problem was actually introduced in
  v4.6 when we unified Kconfig, making PCIe support available everywhere
  including sparc, where config reads into unaligned buffers cause
  warnings.  This fix is from Dave Miller.

  As a reminder, any future PCI fixes for v4.7 will probably come from
  Alex Williamson, since I'll be on vacation for most of the rest of
  this cycle.  I should be back about the time the merge window opens"

* tag 'pci-v4.7-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
  PCI: Fix unaligned accesses in VC code

parents da01e18a ef0dab4a

drivers/pci/vc.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -221,9 +221,9 @@ static int pci_vc_do_save_buffer(struct pci_dev *dev, int pos,
		else
		pci_write_config_word(dev, pos + PCI_VC_PORT_CTRL,
		(u16 )buf);
		buf += 2;
		buf += 4;
		}
		len += 2;
		len += 4;

		/*
		* If we have any Low Priority VCs and a VC Arbitration Table Offset