tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI: fix range check on mmapped sysfs resource files
PCI: remove excess kernel-doc notation
PCI: annotate return value of pci_ioremap_bar with __iomem
PCI: fix VPD limit quirk for Broadcom 5708S

Linus Torvalds 8ec96e7b cb110171

+24 -22
+1 -1
drivers/pci/pci-sysfs.c
··· 575 575 576 576 nr = (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; 577 577 start = vma->vm_pgoff; 578 - size = pci_resource_len(pdev, resno) >> PAGE_SHIFT; 578 + size = ((pci_resource_len(pdev, resno) - 1) >> PAGE_SHIFT) + 1; 579 579 if (start < size && size - start >= nr) 580 580 return 1; 581 581 WARN(1, "process \"%s\" tried to map 0x%08lx-0x%08lx on %s BAR %d (size 0x%08lx)\n",
+18 -18
drivers/pci/quirks.c
··· 1692 1692 } 1693 1693 } 1694 1694 1695 - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 1696 - PCI_DEVICE_ID_NX2_5706, 1697 - quirk_brcm_570x_limit_vpd); 1698 - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 1699 - PCI_DEVICE_ID_NX2_5706S, 1700 - quirk_brcm_570x_limit_vpd); 1701 - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 1702 - PCI_DEVICE_ID_NX2_5708, 1703 - quirk_brcm_570x_limit_vpd); 1704 - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 1705 - PCI_DEVICE_ID_NX2_5708S, 1706 - quirk_brcm_570x_limit_vpd); 1707 - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 1708 - PCI_DEVICE_ID_NX2_5709, 1709 - quirk_brcm_570x_limit_vpd); 1710 - DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_BROADCOM, 1711 - PCI_DEVICE_ID_NX2_5709S, 1712 - quirk_brcm_570x_limit_vpd); 1695 + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, 1696 + PCI_DEVICE_ID_NX2_5706, 1697 + quirk_brcm_570x_limit_vpd); 1698 + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, 1699 + PCI_DEVICE_ID_NX2_5706S, 1700 + quirk_brcm_570x_limit_vpd); 1701 + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, 1702 + PCI_DEVICE_ID_NX2_5708, 1703 + quirk_brcm_570x_limit_vpd); 1704 + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, 1705 + PCI_DEVICE_ID_NX2_5708S, 1706 + quirk_brcm_570x_limit_vpd); 1707 + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, 1708 + PCI_DEVICE_ID_NX2_5709, 1709 + quirk_brcm_570x_limit_vpd); 1710 + DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_BROADCOM, 1711 + PCI_DEVICE_ID_NX2_5709S, 1712 + quirk_brcm_570x_limit_vpd); 1713 1713 1714 1714 #ifdef CONFIG_PCI_MSI 1715 1715 /* Some chipsets do not support MSI. We cannot easily rely on setting
+4 -2
drivers/pci/rom.c
··· 100 100 * pci_map_rom - map a PCI ROM to kernel space 101 101 * @pdev: pointer to pci device struct 102 102 * @size: pointer to receive size of pci window over ROM 103 - * @return: kernel virtual pointer to image of ROM 103 + * 104 + * Return: kernel virtual pointer to image of ROM 104 105 * 105 106 * Map a PCI ROM into kernel space. If ROM is boot video ROM, 106 107 * the shadow BIOS copy will be returned instead of the ··· 168 167 * pci_map_rom_copy - map a PCI ROM to kernel space, create a copy 169 168 * @pdev: pointer to pci device struct 170 169 * @size: pointer to receive size of pci window over ROM 171 - * @return: kernel virtual pointer to image of ROM 170 + * 171 + * Return: kernel virtual pointer to image of ROM 172 172 * 173 173 * Map a PCI ROM into kernel space. If ROM is boot video ROM, 174 174 * the shadow BIOS copy will be returned instead of the
+1 -1
include/linux/pci.h
··· 1136 1136 #endif 1137 1137 1138 1138 #ifdef CONFIG_HAS_IOMEM 1139 - static inline void * pci_ioremap_bar(struct pci_dev *pdev, int bar) 1139 + static inline void __iomem *pci_ioremap_bar(struct pci_dev *pdev, int bar) 1140 1140 { 1141 1141 /* 1142 1142 * Make sure the BAR is actually a memory resource, not an IO resource