diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:01:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-15 14:01:33 -0800 |
| commit | e5c13537b0153010b4f65b9c55faa78a4c151c93 (patch) | |
| tree | 6e2d3eae7532040f070888eb6116fe917f9648e0 /drivers/pci/proc.c | |
| parent | 968ab1838a5d48f02f5b471aa1d0e59e2cc2ccbc (diff) | |
| parent | e25cd062b16ed1d41a157aec5a108abd6ff2e9f9 (diff) | |
| download | linux-e5c13537b0153010b4f65b9c55faa78a4c151c93.tar.gz linux-e5c13537b0153010b4f65b9c55faa78a4c151c93.tar.bz2 linux-e5c13537b0153010b4f65b9c55faa78a4c151c93.zip | |
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: sysfs: fix printk warnings
PCI: fix pci_bus_alloc_resource() hang, prefer positive decode
PCI: read current power state at enable time
PCI: fix size checks for mmap() on /proc/bus/pci files
x86/PCI: coalesce overlapping host bridge windows
PCI hotplug: ibmphp: Add check to prevent reading beyond mapped area
Diffstat (limited to 'drivers/pci/proc.c')
| -rw-r--r-- | drivers/pci/proc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/proc.c b/drivers/pci/proc.c index 297b72c880a1..ea00647f4732 100644 --- a/drivers/pci/proc.c +++ b/drivers/pci/proc.c @@ -257,7 +257,7 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma) /* Make sure the caller is mapping a real resource for this device */ for (i = 0; i < PCI_ROM_RESOURCE; i++) { - if (pci_mmap_fits(dev, i, vma)) + if (pci_mmap_fits(dev, i, vma, PCI_MMAP_PROCFS)) break; } |