diff for duplicates of <20100318152250.21082.35352.stgit@angua> diff --git a/a/1.txt b/N1/1.txt index 44791ae..2fd8918 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -113,7 +113,7 @@ index 0670843..d4981c6 100644 if (!dma_window) return NULL; @@ -1057,7 +1057,7 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev) - if (tbl == NULL) + if (tbl = NULL) return NULL; - of_parse_dma_window(dev->dev.archdata.of_node, dma_window, @@ -124,7 +124,7 @@ index 0670843..d4981c6 100644 @@ -1085,7 +1085,7 @@ static const struct vio_device_id *vio_match_device( { while (ids->type[0] != '\0') { - if ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) && + if ((strncmp(dev->type, ids->type, strlen(ids->type)) = 0) && - of_device_is_compatible(dev->dev.archdata.of_node, + of_device_is_compatible(dev->dev.of_node, ids->compat)) @@ -188,7 +188,7 @@ index ca5bfdf..b610122 100644 * node's iommu. We -might- do something smarter later though it may @@ -553,7 +552,7 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev) iommu = cell_iommu_for_node(dev_to_node(dev)); - if (iommu == NULL || list_empty(&iommu->windows)) { + if (iommu = NULL || list_empty(&iommu->windows)) { printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n", - archdata->of_node ? archdata->of_node->full_name : "?", + dev->of_node ? dev->of_node->full_name : "?", diff --git a/a/content_digest b/N1/content_digest index b567a1a..0739aa7 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020100318144836.21082.93040.stgit@angua\0" "From\0Grant Likely <grant.likely@secretlab.ca>\0" - "Subject\0[V2 PATCH 08/10] arch/powerpc: Remove obsolete dev_archdata.of_node and of_devce.node\0" - "Date\0Thu, 18 Mar 2010 09:22:50 -0600\0" + "Subject\0[V2 PATCH 08/10] arch/powerpc: Remove obsolete dev_archdata.of_node\0" + "Date\0Thu, 18 Mar 2010 15:22:50 +0000\0" "To\0davem@davemloft.net" benh@kernel.crashing.org linux-kernel@vger.kernel.org @@ -126,7 +126,7 @@ " \tif (!dma_window)\n" " \t\treturn NULL;\n" "@@ -1057,7 +1057,7 @@ static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)\n" - " \tif (tbl == NULL)\n" + " \tif (tbl = NULL)\n" " \t\treturn NULL;\n" " \n" "-\tof_parse_dma_window(dev->dev.archdata.of_node, dma_window,\n" @@ -137,7 +137,7 @@ "@@ -1085,7 +1085,7 @@ static const struct vio_device_id *vio_match_device(\n" " {\n" " \twhile (ids->type[0] != '\\0') {\n" - " \t\tif ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) &&\n" + " \t\tif ((strncmp(dev->type, ids->type, strlen(ids->type)) = 0) &&\n" "-\t\t of_device_is_compatible(dev->dev.archdata.of_node,\n" "+\t\t of_device_is_compatible(dev->dev.of_node,\n" " \t\t\t\t\t ids->compat))\n" @@ -201,7 +201,7 @@ " \t * node's iommu. We -might- do something smarter later though it may\n" "@@ -553,7 +552,7 @@ static struct iommu_table *cell_get_iommu_table(struct device *dev)\n" " \tiommu = cell_iommu_for_node(dev_to_node(dev));\n" - " \tif (iommu == NULL || list_empty(&iommu->windows)) {\n" + " \tif (iommu = NULL || list_empty(&iommu->windows)) {\n" " \t\tprintk(KERN_ERR \"iommu: missing iommu for %s (node %d)\\n\",\n" "-\t\t archdata->of_node ? archdata->of_node->full_name : \"?\",\n" "+\t\t dev->of_node ? dev->of_node->full_name : \"?\",\n" @@ -260,4 +260,4 @@ " \t/* If we're the direct child of a root bus, then we need to allocate\n" " \t * an iommu table ourselves. The bus setup code should have setup" -3337489bfb21bd22691a4f85aa0e9062e20d7883a07ec5b0cc237262aaeed77c +c78601be45946cefe540dd0bcaec3944db559b62494e90f264d362d0c2e0c096
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.