|
@@ -202,6 +202,8 @@ static long proc_bus_pci_ioctl(struct file *file, unsigned int cmd,
|
|
|
|
|
|
#ifdef HAVE_PCI_MMAP
|
|
|
case PCIIOC_MMAP_IS_IO:
|
|
|
+ if (!arch_can_pci_mmap_io())
|
|
|
+ return -EINVAL;
|
|
|
fpriv->mmap_state = pci_mmap_io;
|
|
|
break;
|
|
|
|
|
@@ -232,15 +234,16 @@ static int proc_bus_pci_mmap(struct file *file, struct vm_area_struct *vma)
|
|
|
{
|
|
|
struct pci_dev *dev = PDE_DATA(file_inode(file));
|
|
|
struct pci_filp_private *fpriv = file->private_data;
|
|
|
- int i, ret, write_combine = 0, res_bit;
|
|
|
+ int i, ret, write_combine = 0, res_bit = IORESOURCE_MEM;
|
|
|
|
|
|
if (!capable(CAP_SYS_RAWIO))
|
|
|
return -EPERM;
|
|
|
|
|
|
- if (fpriv->mmap_state == pci_mmap_io)
|
|
|
+ if (fpriv->mmap_state == pci_mmap_io) {
|
|
|
+ if (!arch_can_pci_mmap_io())
|
|
|
+ return -EINVAL;
|
|
|
res_bit = IORESOURCE_IO;
|
|
|
- else
|
|
|
- res_bit = IORESOURCE_MEM;
|
|
|
+ }
|
|
|
|
|
|
/* Make sure the caller is mapping a real resource for this device */
|
|
|
for (i = 0; i < PCI_ROM_RESOURCE; i++) {
|