diff for duplicates of <20160617021555.GA21125@localhost> diff --git a/a/1.txt b/N1/1.txt index ba95131..1763700 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ On Thu, Jun 09, 2016 at 03:25:52PM -0700, Yinghai Lu wrote: > > | start = vma->vm_pgoff; > | size = ((pci_resource_len(pdev, resno) - 1) >> PAGE_SHIFT) + 1; -> | pci_start = (mmap_api == PCI_MMAP_PROCFS) ? +> | pci_start = (mmap_api = PCI_MMAP_PROCFS) ? > | pci_resource_start(pdev, resno) >> PAGE_SHIFT : 0; > | if (start >= pci_start && start < pci_start + size && > | start + nr <= pci_start + size) @@ -80,7 +80,7 @@ This is a pretty big patch. It would help a lot to split it up. > - return NULL; /* should never happen */ > - > - /* If memory, add on the PCI bridge address offset */ -> - if (mmap_state == pci_mmap_mem) { +> - if (mmap_state = pci_mmap_mem) { > -#if 0 /* See comment in pci_resource_to_user() for why this is disabled */ > - *offset += hose->pci_mem_offset; > -#endif @@ -100,11 +100,11 @@ This is a pretty big patch. It would help a lot to split it up. > - int flags = rp->flags; > - > - /* treat ROM as memory (should be already) */ -> - if (i == PCI_ROM_RESOURCE) +> - if (i = PCI_ROM_RESOURCE) > - flags |= IORESOURCE_MEM; > - > - /* Active and same type? */ -> - if ((flags & res_bit) == 0) +> - if ((flags & res_bit) = 0) > - continue; > - > - /* In the range of this resource? */ @@ -117,7 +117,7 @@ being done in pci_mmap_fits() (or wherever it is). > - > - /* found it! construct the final physical address */ -> - if (mmap_state == pci_mmap_io) +> - if (mmap_state = pci_mmap_io) > - *offset += hose->io_base_phys - io_offset; > - return rp; @@ -136,15 +136,14 @@ into pci_mmap_page_range(). > * above routine > @@ -282,12 +219,15 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, > { -> resource_size_t offset = -> ((resource_size_t)vma->vm_pgoff) << PAGE_SHIFT; +> resource_size_t offset > ((resource_size_t)vma->vm_pgoff) << PAGE_SHIFT; > - struct resource *rp; > int ret; > > - rp = __pci_mmap_make_offset(dev, &offset, mmap_state); -> - if (rp == NULL) +> - if (rp = NULL) > - return -EINVAL; -> + if (mmap_state == pci_mmap_io) { +> + if (mmap_state = pci_mmap_io) { > + struct pci_controller *hose = pci_bus_to_host(dev->bus); > + > + /* hose should never be NULL */ @@ -199,11 +198,11 @@ remove simplify pci_resource_to_user() and clean up this comment. > - unsigned long io_offset = 0; > - int i, res_bit; > - -> - if (hose == NULL) +> - if (hose = NULL) > - return NULL; /* should never happen */ > - > - /* If memory, add on the PCI bridge address offset */ -> - if (mmap_state == pci_mmap_mem) { +> - if (mmap_state = pci_mmap_mem) { > -#if 0 /* See comment in pci_resource_to_user() for why this is disabled */ > - *offset += hose->pci_mem_offset; > -#endif @@ -223,11 +222,11 @@ remove simplify pci_resource_to_user() and clean up this comment. > - int flags = rp->flags; > - > - /* treat ROM as memory (should be already) */ -> - if (i == PCI_ROM_RESOURCE) +> - if (i = PCI_ROM_RESOURCE) > - flags |= IORESOURCE_MEM; > - > - /* Active and same type? */ -> - if ((flags & res_bit) == 0) +> - if ((flags & res_bit) = 0) > - continue; > - > - /* In the range of this resource? */ @@ -235,7 +234,7 @@ remove simplify pci_resource_to_user() and clean up this comment. > - continue; > - > - /* found it! construct the final physical address */ -> - if (mmap_state == pci_mmap_io) +> - if (mmap_state = pci_mmap_io) > - *offset += hose->io_base_phys - io_offset; > - return rp; > - } @@ -249,15 +248,14 @@ remove simplify pci_resource_to_user() and clean up this comment. > * above routine > @@ -420,12 +357,15 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, > { -> resource_size_t offset = -> ((resource_size_t)vma->vm_pgoff) << PAGE_SHIFT; +> resource_size_t offset > ((resource_size_t)vma->vm_pgoff) << PAGE_SHIFT; > - struct resource *rp; > int ret; > > - rp = __pci_mmap_make_offset(dev, &offset, mmap_state); -> - if (rp == NULL) +> - if (rp = NULL) > - return -EINVAL; -> + if (mmap_state == pci_mmap_io) { +> + if (mmap_state = pci_mmap_io) { > + struct pci_controller *hose = pci_bus_to_host(dev->bus); > + > + /* hose should never be NULL */ @@ -304,7 +302,7 @@ __pci_mmap_make_offset() here. > - struct pci_pbm_info *pbm = pdev->dev.archdata.host_controller; > - unsigned long space_size, user_offset, user_size; > - -> - if (mmap_state == pci_mmap_io) { +> - if (mmap_state = pci_mmap_io) { > - space_size = resource_size(&pbm->io_space); > - } else { > - space_size = resource_size(&pbm->mem_space); @@ -318,7 +316,7 @@ __pci_mmap_make_offset() here. > - (user_offset + user_size) > space_size) > - return -EINVAL; > - -> - if (mmap_state == pci_mmap_io) { +> - if (mmap_state = pci_mmap_io) { > - vma->vm_pgoff = (pbm->io_space.start + > - user_offset) >> PAGE_SHIFT; > - } else { @@ -357,7 +355,7 @@ __pci_mmap_make_offset() here. > - /* If this is a mapping on a host bridge, any address > - * is OK. > - */ -> - if ((pdev->class >> 8) == PCI_CLASS_BRIDGE_HOST) +> - if ((pdev->class >> 8) = PCI_CLASS_BRIDGE_HOST) > - return err; > - > - /* Otherwise make sure it's in the range for one of the @@ -375,14 +373,14 @@ __pci_mmap_make_offset() here. > - continue; > - > - /* Same type? */ -> - if (i == PCI_ROM_RESOURCE) { +> - if (i = PCI_ROM_RESOURCE) { > - if (mmap_state != pci_mmap_mem) > - continue; > - } else { -> - if ((mmap_state == pci_mmap_io && -> - (rp->flags & IORESOURCE_IO) == 0) || -> - (mmap_state == pci_mmap_mem && -> - (rp->flags & IORESOURCE_MEM) == 0)) +> - if ((mmap_state = pci_mmap_io && +> - (rp->flags & IORESOURCE_IO) = 0) || +> - (mmap_state = pci_mmap_mem && +> - (rp->flags & IORESOURCE_MEM) = 0)) > - continue; > - } > - @@ -445,11 +443,11 @@ __pci_mmap_make_offset() here. > - unsigned long io_offset = 0; > - int i, res_bit; > - -> - if (pci_ctrl == 0) +> - if (pci_ctrl = 0) > - return -EINVAL; /* should never happen */ > - > - /* If memory, add on the PCI bridge address offset */ -> - if (mmap_state == pci_mmap_mem) { +> - if (mmap_state = pci_mmap_mem) { > - res_bit = IORESOURCE_MEM; > - } else { > - io_offset = (unsigned long)pci_ctrl->io_space.base; @@ -466,11 +464,11 @@ __pci_mmap_make_offset() here. > - int flags = rp->flags; > - > - /* treat ROM as memory (should be already) */ -> - if (i == PCI_ROM_RESOURCE) +> - if (i = PCI_ROM_RESOURCE) > - flags |= IORESOURCE_MEM; > - > - /* Active and same type? */ -> - if ((flags & res_bit) == 0) +> - if ((flags & res_bit) = 0) > - continue; > - > - /* In the range of this resource? */ @@ -478,7 +476,7 @@ __pci_mmap_make_offset() here. > - continue; > - > - /* found it! construct the final physical address */ -> - if (mmap_state == pci_mmap_io) +> - if (mmap_state = pci_mmap_io) > - offset += pci_ctrl->io_space.start - io_offset; > - vma->vm_pgoff = offset >> PAGE_SHIFT; > - return 0; @@ -501,9 +499,8 @@ __pci_mmap_make_offset() here. > - ret = __pci_mmap_make_offset(dev, vma, mmap_state); > - if (ret < 0) > - return ret; -> + if (mmap_state == pci_mmap_io) { -> + struct pci_controller *pci_ctrl = -> + (struct pci_controller *)dev->sysdata; +> + if (mmap_state = pci_mmap_io) { +> + struct pci_controller *pci_ctrl > + (struct pci_controller *)dev->sysdata; > + > + /* pci_ctrl should never be NULL */ > + offset += pci_ctrl->io_space.start - pci_ctrl->io_space.base; @@ -530,10 +527,10 @@ And here (same comment as microblaze and powerpc). > unsigned long nr, start, size, pci_start; > + int flags; > -> if (pci_resource_len(pdev, resno) == 0) +> if (pci_resource_len(pdev, resno) = 0) > return 0; > + -> + if (mmap_type == pci_mmap_mem) +> + if (mmap_type = pci_mmap_mem) > + flags = IORESOURCE_MEM; > + else > + flags = IORESOURCE_IO; @@ -635,7 +632,7 @@ would tell us something useful. > + if (!(res->flags & flags)) > + continue; > + -> + if (pci_resource_len(dev, i) == 0) +> + if (pci_resource_len(dev, i) = 0) > + continue; > + > + /* @@ -674,7 +671,7 @@ would tell us something useful. > - > - if (i >= PCI_ROM_RESOURCE) > + offset = vma->vm_pgoff << PAGE_SHIFT; -> + if (fpriv->mmap_state == pci_mmap_mem) +> + if (fpriv->mmap_state = pci_mmap_mem) > + flags = IORESOURCE_MEM; > + else > + flags = IORESOURCE_IO; @@ -692,7 +689,7 @@ would tell us something useful. > + return -EINVAL; > + } > + -> if (fpriv->mmap_state == pci_mmap_mem) +> if (fpriv->mmap_state = pci_mmap_mem) > write_combine = fpriv->write_combine; > else @@ -740,7 +737,7 @@ index 1974567..e0dd64e 100644 - resource_size_t offset = 0; + struct pci_bus_region region; -- if (hose == NULL) +- if (hose = NULL) + if (rsrc->flags & IORESOURCE_IO) { + pcibios_resource_to_bus(dev, ®ion, rsrc); + *start = region.start; @@ -832,7 +829,7 @@ index 8c6beb0..16d9e14 100644 - resource_size_t offset = 0; + struct pci_bus_region region; -- if (hose == NULL) +- if (hose = NULL) + if (rsrc->flags & IORESOURCE_IO) { + pcibios_resource_to_bus(dev, ®ion, rsrc); + *start = region.start; diff --git a/a/content_digest b/N1/content_digest index 40d9e71..2dc2282 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020160609222552.6938-1-yinghai@kernel.org\0" "From\0Bjorn Helgaas <helgaas@kernel.org>\0" "Subject\0Re: [PATCH v12.update2 02/15] PCI: Let pci_mmap_page_range() take resource address\0" - "Date\0Thu, 16 Jun 2016 21:15:55 -0500\0" + "Date\0Fri, 17 Jun 2016 02:15:55 +0000\0" "To\0Yinghai Lu <yinghai@kernel.org>\0" "Cc\0Bjorn Helgaas <bhelgaas@google.com>" David Miller <davem@davemloft.net> @@ -22,7 +22,7 @@ "> \n" "> | start = vma->vm_pgoff;\n" "> | size = ((pci_resource_len(pdev, resno) - 1) >> PAGE_SHIFT) + 1;\n" - "> | pci_start = (mmap_api == PCI_MMAP_PROCFS) ?\n" + "> | pci_start = (mmap_api = PCI_MMAP_PROCFS) ?\n" "> | pci_resource_start(pdev, resno) >> PAGE_SHIFT : 0;\n" "> | if (start >= pci_start && start < pci_start + size &&\n" "> | start + nr <= pci_start + size)\n" @@ -98,7 +98,7 @@ "> -\t\treturn NULL;\t\t/* should never happen */\n" "> -\n" "> -\t/* If memory, add on the PCI bridge address offset */\n" - "> -\tif (mmap_state == pci_mmap_mem) {\n" + "> -\tif (mmap_state = pci_mmap_mem) {\n" "> -#if 0 /* See comment in pci_resource_to_user() for why this is disabled */\n" "> -\t\t*offset += hose->pci_mem_offset;\n" "> -#endif\n" @@ -118,11 +118,11 @@ "> -\t\tint flags = rp->flags;\n" "> -\n" "> -\t\t/* treat ROM as memory (should be already) */\n" - "> -\t\tif (i == PCI_ROM_RESOURCE)\n" + "> -\t\tif (i = PCI_ROM_RESOURCE)\n" "> -\t\t\tflags |= IORESOURCE_MEM;\n" "> -\n" "> -\t\t/* Active and same type? */\n" - "> -\t\tif ((flags & res_bit) == 0)\n" + "> -\t\tif ((flags & res_bit) = 0)\n" "> -\t\t\tcontinue;\n" "> -\n" "> -\t\t/* In the range of this resource? */\n" @@ -135,7 +135,7 @@ "\n" "> -\n" "> -\t\t/* found it! construct the final physical address */\n" - "> -\t\tif (mmap_state == pci_mmap_io)\n" + "> -\t\tif (mmap_state = pci_mmap_io)\n" "> -\t\t\t*offset += hose->io_base_phys - io_offset;\n" "> -\t\treturn rp;\n" "\n" @@ -154,15 +154,14 @@ "> * above routine\n" "> @@ -282,12 +219,15 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,\n" "> {\n" - "> \tresource_size_t offset =\n" - "> \t\t((resource_size_t)vma->vm_pgoff) << PAGE_SHIFT;\n" + "> \tresource_size_t offset > \t\t((resource_size_t)vma->vm_pgoff) << PAGE_SHIFT;\n" "> -\tstruct resource *rp;\n" "> \tint ret;\n" "> \n" "> -\trp = __pci_mmap_make_offset(dev, &offset, mmap_state);\n" - "> -\tif (rp == NULL)\n" + "> -\tif (rp = NULL)\n" "> -\t\treturn -EINVAL;\n" - "> +\tif (mmap_state == pci_mmap_io) {\n" + "> +\tif (mmap_state = pci_mmap_io) {\n" "> +\t\tstruct pci_controller *hose = pci_bus_to_host(dev->bus);\n" "> +\n" "> +\t\t/* hose should never be NULL */\n" @@ -217,11 +216,11 @@ "> -\tunsigned long io_offset = 0;\n" "> -\tint i, res_bit;\n" "> -\n" - "> -\tif (hose == NULL)\n" + "> -\tif (hose = NULL)\n" "> -\t\treturn NULL;\t\t/* should never happen */\n" "> -\n" "> -\t/* If memory, add on the PCI bridge address offset */\n" - "> -\tif (mmap_state == pci_mmap_mem) {\n" + "> -\tif (mmap_state = pci_mmap_mem) {\n" "> -#if 0 /* See comment in pci_resource_to_user() for why this is disabled */\n" "> -\t\t*offset += hose->pci_mem_offset;\n" "> -#endif\n" @@ -241,11 +240,11 @@ "> -\t\tint flags = rp->flags;\n" "> -\n" "> -\t\t/* treat ROM as memory (should be already) */\n" - "> -\t\tif (i == PCI_ROM_RESOURCE)\n" + "> -\t\tif (i = PCI_ROM_RESOURCE)\n" "> -\t\t\tflags |= IORESOURCE_MEM;\n" "> -\n" "> -\t\t/* Active and same type? */\n" - "> -\t\tif ((flags & res_bit) == 0)\n" + "> -\t\tif ((flags & res_bit) = 0)\n" "> -\t\t\tcontinue;\n" "> -\n" "> -\t\t/* In the range of this resource? */\n" @@ -253,7 +252,7 @@ "> -\t\t\tcontinue;\n" "> -\n" "> -\t\t/* found it! construct the final physical address */\n" - "> -\t\tif (mmap_state == pci_mmap_io)\n" + "> -\t\tif (mmap_state = pci_mmap_io)\n" "> -\t\t\t*offset += hose->io_base_phys - io_offset;\n" "> -\t\treturn rp;\n" "> -\t}\n" @@ -267,15 +266,14 @@ "> * above routine\n" "> @@ -420,12 +357,15 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,\n" "> {\n" - "> \tresource_size_t offset =\n" - "> \t\t((resource_size_t)vma->vm_pgoff) << PAGE_SHIFT;\n" + "> \tresource_size_t offset > \t\t((resource_size_t)vma->vm_pgoff) << PAGE_SHIFT;\n" "> -\tstruct resource *rp;\n" "> \tint ret;\n" "> \n" "> -\trp = __pci_mmap_make_offset(dev, &offset, mmap_state);\n" - "> -\tif (rp == NULL)\n" + "> -\tif (rp = NULL)\n" "> -\t\treturn -EINVAL;\n" - "> +\tif (mmap_state == pci_mmap_io) {\n" + "> +\tif (mmap_state = pci_mmap_io) {\n" "> +\t\tstruct pci_controller *hose = pci_bus_to_host(dev->bus);\n" "> +\n" "> +\t\t/* hose should never be NULL */\n" @@ -322,7 +320,7 @@ "> -\tstruct pci_pbm_info *pbm = pdev->dev.archdata.host_controller;\n" "> -\tunsigned long space_size, user_offset, user_size;\n" "> -\n" - "> -\tif (mmap_state == pci_mmap_io) {\n" + "> -\tif (mmap_state = pci_mmap_io) {\n" "> -\t\tspace_size = resource_size(&pbm->io_space);\n" "> -\t} else {\n" "> -\t\tspace_size = resource_size(&pbm->mem_space);\n" @@ -336,7 +334,7 @@ "> -\t (user_offset + user_size) > space_size)\n" "> -\t\treturn -EINVAL;\n" "> -\n" - "> -\tif (mmap_state == pci_mmap_io) {\n" + "> -\tif (mmap_state = pci_mmap_io) {\n" "> -\t\tvma->vm_pgoff = (pbm->io_space.start +\n" "> -\t\t\t\t user_offset) >> PAGE_SHIFT;\n" "> -\t} else {\n" @@ -375,7 +373,7 @@ "> -\t/* If this is a mapping on a host bridge, any address\n" "> -\t * is OK.\n" "> -\t */\n" - "> -\tif ((pdev->class >> 8) == PCI_CLASS_BRIDGE_HOST)\n" + "> -\tif ((pdev->class >> 8) = PCI_CLASS_BRIDGE_HOST)\n" "> -\t\treturn err;\n" "> -\n" "> -\t/* Otherwise make sure it's in the range for one of the\n" @@ -393,14 +391,14 @@ "> -\t\t\tcontinue;\n" "> -\n" "> -\t\t/* Same type? */\n" - "> -\t\tif (i == PCI_ROM_RESOURCE) {\n" + "> -\t\tif (i = PCI_ROM_RESOURCE) {\n" "> -\t\t\tif (mmap_state != pci_mmap_mem)\n" "> -\t\t\t\tcontinue;\n" "> -\t\t} else {\n" - "> -\t\t\tif ((mmap_state == pci_mmap_io &&\n" - "> -\t\t\t (rp->flags & IORESOURCE_IO) == 0) ||\n" - "> -\t\t\t (mmap_state == pci_mmap_mem &&\n" - "> -\t\t\t (rp->flags & IORESOURCE_MEM) == 0))\n" + "> -\t\t\tif ((mmap_state = pci_mmap_io &&\n" + "> -\t\t\t (rp->flags & IORESOURCE_IO) = 0) ||\n" + "> -\t\t\t (mmap_state = pci_mmap_mem &&\n" + "> -\t\t\t (rp->flags & IORESOURCE_MEM) = 0))\n" "> -\t\t\t\tcontinue;\n" "> -\t\t}\n" "> -\n" @@ -463,11 +461,11 @@ "> -\tunsigned long io_offset = 0;\n" "> -\tint i, res_bit;\n" "> -\n" - "> -\tif (pci_ctrl == 0)\n" + "> -\tif (pci_ctrl = 0)\n" "> -\t\treturn -EINVAL;\t\t/* should never happen */\n" "> -\n" "> -\t/* If memory, add on the PCI bridge address offset */\n" - "> -\tif (mmap_state == pci_mmap_mem) {\n" + "> -\tif (mmap_state = pci_mmap_mem) {\n" "> -\t\tres_bit = IORESOURCE_MEM;\n" "> -\t} else {\n" "> -\t\tio_offset = (unsigned long)pci_ctrl->io_space.base;\n" @@ -484,11 +482,11 @@ "> -\t\tint flags = rp->flags;\n" "> -\n" "> -\t\t/* treat ROM as memory (should be already) */\n" - "> -\t\tif (i == PCI_ROM_RESOURCE)\n" + "> -\t\tif (i = PCI_ROM_RESOURCE)\n" "> -\t\t\tflags |= IORESOURCE_MEM;\n" "> -\n" "> -\t\t/* Active and same type? */\n" - "> -\t\tif ((flags & res_bit) == 0)\n" + "> -\t\tif ((flags & res_bit) = 0)\n" "> -\t\t\tcontinue;\n" "> -\n" "> -\t\t/* In the range of this resource? */\n" @@ -496,7 +494,7 @@ "> -\t\t\tcontinue;\n" "> -\n" "> -\t\t/* found it! construct the final physical address */\n" - "> -\t\tif (mmap_state == pci_mmap_io)\n" + "> -\t\tif (mmap_state = pci_mmap_io)\n" "> -\t\t\toffset += pci_ctrl->io_space.start - io_offset;\n" "> -\t\tvma->vm_pgoff = offset >> PAGE_SHIFT;\n" "> -\t\treturn 0;\n" @@ -519,9 +517,8 @@ "> -\tret = __pci_mmap_make_offset(dev, vma, mmap_state);\n" "> -\tif (ret < 0)\n" "> -\t\treturn ret;\n" - "> +\tif (mmap_state == pci_mmap_io) {\n" - "> +\t\tstruct pci_controller *pci_ctrl =\n" - "> +\t\t\t\t\t (struct pci_controller *)dev->sysdata;\n" + "> +\tif (mmap_state = pci_mmap_io) {\n" + "> +\t\tstruct pci_controller *pci_ctrl > +\t\t\t\t\t (struct pci_controller *)dev->sysdata;\n" "> +\n" "> +\t\t/* pci_ctrl should never be NULL */\n" "> +\t\toffset += pci_ctrl->io_space.start - pci_ctrl->io_space.base;\n" @@ -548,10 +545,10 @@ "> \tunsigned long nr, start, size, pci_start;\n" "> +\tint flags;\n" "> \n" - "> \tif (pci_resource_len(pdev, resno) == 0)\n" + "> \tif (pci_resource_len(pdev, resno) = 0)\n" "> \t\treturn 0;\n" "> +\n" - "> +\tif (mmap_type == pci_mmap_mem)\n" + "> +\tif (mmap_type = pci_mmap_mem)\n" "> +\t\tflags = IORESOURCE_MEM;\n" "> +\telse\n" "> +\t\tflags = IORESOURCE_IO;\n" @@ -653,7 +650,7 @@ "> +\t\tif (!(res->flags & flags))\n" "> +\t\t\tcontinue;\n" "> +\n" - "> +\t\tif (pci_resource_len(dev, i) == 0)\n" + "> +\t\tif (pci_resource_len(dev, i) = 0)\n" "> +\t\t\tcontinue;\n" "> +\n" "> +\t\t/*\n" @@ -692,7 +689,7 @@ "> -\n" "> -\tif (i >= PCI_ROM_RESOURCE)\n" "> +\toffset = vma->vm_pgoff << PAGE_SHIFT;\n" - "> +\tif (fpriv->mmap_state == pci_mmap_mem)\n" + "> +\tif (fpriv->mmap_state = pci_mmap_mem)\n" "> +\t\tflags = IORESOURCE_MEM;\n" "> +\telse\n" "> +\t\tflags = IORESOURCE_IO;\n" @@ -710,7 +707,7 @@ "> +\t\treturn -EINVAL;\n" "> +\t}\n" "> +\n" - "> \tif (fpriv->mmap_state == pci_mmap_mem)\n" + "> \tif (fpriv->mmap_state = pci_mmap_mem)\n" "> \t\twrite_combine = fpriv->write_combine;\n" "> \telse\n" "\n" @@ -758,7 +755,7 @@ "-\tresource_size_t offset = 0;\n" "+\tstruct pci_bus_region region;\n" " \n" - "-\tif (hose == NULL)\n" + "-\tif (hose = NULL)\n" "+\tif (rsrc->flags & IORESOURCE_IO) {\n" "+\t\tpcibios_resource_to_bus(dev, ®ion, rsrc);\n" "+\t\t*start = region.start;\n" @@ -850,7 +847,7 @@ "-\tresource_size_t offset = 0;\n" "+\tstruct pci_bus_region region;\n" " \n" - "-\tif (hose == NULL)\n" + "-\tif (hose = NULL)\n" "+\tif (rsrc->flags & IORESOURCE_IO) {\n" "+\t\tpcibios_resource_to_bus(dev, ®ion, rsrc);\n" "+\t\t*start = region.start;\n" @@ -956,4 +953,4 @@ " \n" void pcibios_set_master(struct pci_dev *dev) -3183057abf74b57f07a295339837aa4a872832cf810fea8ab99af7d41ad05cde +a11d20ec9924a7a1cfa38c6e462327828ec82f8927322040727e01baceec2117
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.