diff for duplicates of <1430793970-11159-3-git-send-email-jiang.liu@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 438f85a..47e8fec 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -76,13 +76,13 @@ index d4e162d35b34..23689d4c37ae 100644 - - min = addr->address.minimum; - max = min + addr->address.address_length - 1; -- if (addr->info.io.translation_type == ACPI_SPARSE_TRANSLATION) +- if (addr->info.io.translation_type = ACPI_SPARSE_TRANSLATION) + if (res->flags & IORESOURCE_IO_SPARSE) sparse = 1; - - space_nr = new_space(addr->address.translation_offset, sparse); + space_nr = new_space(entry->offset, sparse); - if (space_nr == ~0) + if (space_nr = ~0) goto free_resource; + name = (char *)(iospace + 1); @@ -141,7 +141,7 @@ index d4e162d35b34..23689d4c37ae 100644 +static bool resource_is_pcicfg_ioport(struct resource *res) +{ + return (res->flags & IORESOURCE_IO) && -+ res->start == 0xCF8 && res->end == 0xCFF; ++ res->start = 0xCF8 && res->end = 0xCFF; } -static acpi_status resource_to_window(struct acpi_resource *resource, @@ -162,8 +162,8 @@ index d4e162d35b34..23689d4c37ae 100644 - */ - status = acpi_resource_to_address64(resource, addr); - if (ACPI_SUCCESS(status) && -- (addr->resource_type == ACPI_MEMORY_RANGE || -- addr->resource_type == ACPI_IO_RANGE) && +- (addr->resource_type = ACPI_MEMORY_RANGE || +- addr->resource_type = ACPI_IO_RANGE) && - addr->address.address_length) - return AE_OK; - @@ -197,15 +197,15 @@ index d4e162d35b34..23689d4c37ae 100644 - if (!ACPI_SUCCESS(status)) - return AE_OK; - -- if (addr.resource_type == ACPI_MEMORY_RANGE) { +- if (addr.resource_type = ACPI_MEMORY_RANGE) { - flags = IORESOURCE_MEM; - root = &iomem_resource; - offset = addr.address.translation_offset; -- } else if (addr.resource_type == ACPI_IO_RANGE) { +- } else if (addr.resource_type = ACPI_IO_RANGE) { - flags = IORESOURCE_IO; - root = &ioport_resource; - offset = add_io_space(info, &addr); -- if (offset == ~0) +- if (offset = ~0) - return AE_OK; - } else - return AE_OK; @@ -244,7 +244,7 @@ index d4e162d35b34..23689d4c37ae 100644 + if (ret < 0) + dev_warn(&device->dev, + "failed to parse _CRS method, error code %d\n", ret); -+ else if (ret == 0) ++ else if (ret = 0) + dev_dbg(&device->dev, + "no IO and memory resources present in _CRS\n"); + else @@ -271,7 +271,7 @@ index d4e162d35b34..23689d4c37ae 100644 + struct resource *res1, *res2, *root = NULL; + struct resource_entry *tmp, *entry, *entry2; + -+ BUG_ON((type & (IORESOURCE_MEM | IORESOURCE_IO)) == 0); ++ BUG_ON((type & (IORESOURCE_MEM | IORESOURCE_IO)) = 0); + root = (type & IORESOURCE_MEM) ? &iomem_resource : &ioport_resource; + + list_splice_init(resources, &list); @@ -434,16 +434,14 @@ index d4e162d35b34..23689d4c37ae 100644 - acpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window, - &info->res_num); - if (info->res_num) { -- info->res = -- kzalloc_node(sizeof(*info->res) * info->res_num, +- info->res - kzalloc_node(sizeof(*info->res) * info->res_num, - GFP_KERNEL, info->controller->node); - if (!info->res) { - kfree(name); - return -ENOMEM; - } - -- info->res_offset = -- kzalloc_node(sizeof(*info->res_offset) * info->res_num, +- info->res_offset - kzalloc_node(sizeof(*info->res_offset) * info->res_num, - GFP_KERNEL, info->controller->node); - if (!info->res_offset) { - kfree(name); diff --git a/a/content_digest b/N1/content_digest index 71349db..e69552d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01430793970-11159-1-git-send-email-jiang.liu@linux.intel.com\0" "From\0Jiang Liu <jiang.liu@linux.intel.com>\0" "Subject\0[RFC v2 2/7] ia64/PCI/ACPI: Use common ACPI resource parsing interface for host bridge\0" - "Date\0Tue, 5 May 2015 10:46:05 +0800\0" + "Date\0Tue, 05 May 2015 02:46:05 +0000\0" "To\0Rafael J . Wysocki <rjw@rjwysocki.net>" Bjorn Helgaas <bhelgaas@google.com> Marc Zyngier <marc.zyngier@arm.com> @@ -99,13 +99,13 @@ "-\n" "-\tmin = addr->address.minimum;\n" "-\tmax = min + addr->address.address_length - 1;\n" - "-\tif (addr->info.io.translation_type == ACPI_SPARSE_TRANSLATION)\n" + "-\tif (addr->info.io.translation_type = ACPI_SPARSE_TRANSLATION)\n" "+\tif (res->flags & IORESOURCE_IO_SPARSE)\n" " \t\tsparse = 1;\n" "-\n" "-\tspace_nr = new_space(addr->address.translation_offset, sparse);\n" "+\tspace_nr = new_space(entry->offset, sparse);\n" - " \tif (space_nr == ~0)\n" + " \tif (space_nr = ~0)\n" " \t\tgoto free_resource;\n" " \n" "+\tname = (char *)(iospace + 1);\n" @@ -164,7 +164,7 @@ "+static bool resource_is_pcicfg_ioport(struct resource *res)\n" "+{\n" "+\treturn (res->flags & IORESOURCE_IO) &&\n" - "+\t\tres->start == 0xCF8 && res->end == 0xCFF;\n" + "+\t\tres->start = 0xCF8 && res->end = 0xCFF;\n" " }\n" " \n" "-static acpi_status resource_to_window(struct acpi_resource *resource,\n" @@ -185,8 +185,8 @@ "-\t */\n" "-\tstatus = acpi_resource_to_address64(resource, addr);\n" "-\tif (ACPI_SUCCESS(status) &&\n" - "-\t (addr->resource_type == ACPI_MEMORY_RANGE ||\n" - "-\t addr->resource_type == ACPI_IO_RANGE) &&\n" + "-\t (addr->resource_type = ACPI_MEMORY_RANGE ||\n" + "-\t addr->resource_type = ACPI_IO_RANGE) &&\n" "-\t addr->address.address_length)\n" "-\t\treturn AE_OK;\n" "-\n" @@ -220,15 +220,15 @@ "-\tif (!ACPI_SUCCESS(status))\n" "-\t\treturn AE_OK;\n" "-\n" - "-\tif (addr.resource_type == ACPI_MEMORY_RANGE) {\n" + "-\tif (addr.resource_type = ACPI_MEMORY_RANGE) {\n" "-\t\tflags = IORESOURCE_MEM;\n" "-\t\troot = &iomem_resource;\n" "-\t\toffset = addr.address.translation_offset;\n" - "-\t} else if (addr.resource_type == ACPI_IO_RANGE) {\n" + "-\t} else if (addr.resource_type = ACPI_IO_RANGE) {\n" "-\t\tflags = IORESOURCE_IO;\n" "-\t\troot = &ioport_resource;\n" "-\t\toffset = add_io_space(info, &addr);\n" - "-\t\tif (offset == ~0)\n" + "-\t\tif (offset = ~0)\n" "-\t\t\treturn AE_OK;\n" "-\t} else\n" "-\t\treturn AE_OK;\n" @@ -267,7 +267,7 @@ "+\tif (ret < 0)\n" "+\t\tdev_warn(&device->dev,\n" "+\t\t\t \"failed to parse _CRS method, error code %d\\n\", ret);\n" - "+\telse if (ret == 0)\n" + "+\telse if (ret = 0)\n" "+\t\tdev_dbg(&device->dev,\n" "+\t\t\t\"no IO and memory resources present in _CRS\\n\");\n" "+\telse\n" @@ -294,7 +294,7 @@ "+\tstruct resource *res1, *res2, *root = NULL;\n" "+\tstruct resource_entry *tmp, *entry, *entry2;\n" "+\n" - "+\tBUG_ON((type & (IORESOURCE_MEM | IORESOURCE_IO)) == 0);\n" + "+\tBUG_ON((type & (IORESOURCE_MEM | IORESOURCE_IO)) = 0);\n" "+\troot = (type & IORESOURCE_MEM) ? &iomem_resource : &ioport_resource;\n" "+\n" "+\tlist_splice_init(resources, &list);\n" @@ -457,16 +457,14 @@ "-\tacpi_walk_resources(device->handle, METHOD_NAME__CRS, count_window,\n" "-\t\t\t&info->res_num);\n" "-\tif (info->res_num) {\n" - "-\t\tinfo->res =\n" - "-\t\t\tkzalloc_node(sizeof(*info->res) * info->res_num,\n" + "-\t\tinfo->res -\t\t\tkzalloc_node(sizeof(*info->res) * info->res_num,\n" "-\t\t\t\t GFP_KERNEL, info->controller->node);\n" "-\t\tif (!info->res) {\n" "-\t\t\tkfree(name);\n" "-\t\t\treturn -ENOMEM;\n" "-\t\t}\n" "-\n" - "-\t\tinfo->res_offset =\n" - "-\t\t\tkzalloc_node(sizeof(*info->res_offset) * info->res_num,\n" + "-\t\tinfo->res_offset -\t\t\tkzalloc_node(sizeof(*info->res_offset) * info->res_num,\n" "-\t\t\t\t\tGFP_KERNEL, info->controller->node);\n" "-\t\tif (!info->res_offset) {\n" "-\t\t\tkfree(name);\n" @@ -555,4 +553,4 @@ "-- \n" 1.7.10.4 -b19a350da2b57a579520bf7d2d4700b35834ff832d39e089765710ddd9d9a5c8 +5539f5bc42a2ae01837508100212564e589d82f54ff7f86d6de60bd10ed15554
diff --git a/a/1.txt b/N2/1.txt index 438f85a..779f33d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -510,7 +510,7 @@ index d4e162d35b34..23689d4c37ae 100644 kfree(info); return NULL; } -- /* insert busn resource at first */ +- /* insert busn resource@first */ + add_resources(info, &info->bridge->dev); pci_add_resource(&info->resources, &root->secondary); + diff --git a/a/content_digest b/N2/content_digest index 71349db..8af2a9e 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,24 +1,8 @@ "ref\01430793970-11159-1-git-send-email-jiang.liu@linux.intel.com\0" - "From\0Jiang Liu <jiang.liu@linux.intel.com>\0" + "From\0jiang.liu@linux.intel.com (Jiang Liu)\0" "Subject\0[RFC v2 2/7] ia64/PCI/ACPI: Use common ACPI resource parsing interface for host bridge\0" "Date\0Tue, 5 May 2015 10:46:05 +0800\0" - "To\0Rafael J . Wysocki <rjw@rjwysocki.net>" - Bjorn Helgaas <bhelgaas@google.com> - Marc Zyngier <marc.zyngier@arm.com> - Hanjun Guo <hanjun.guo@linaro.org> - Yijing Wang <wangyijing@huawei.com> - Tony Luck <tony.luck@intel.com> - Fenghua Yu <fenghua.yu@intel.com> - Jiang Liu <jiang.liu@linux.intel.com> - " Yinghai Lu <yinghai@kernel.org>\0" - "Cc\0Lv Zheng <lv.zheng@intel.com>" - lenb @ kernel . org <lenb@kernel.org> - LKML <linux-kernel@vger.kernel.org> - linux-pci@vger.kernel.org - linux-acpi@vger.kernel.org - x86 @ kernel . org <x86@kernel.org> - linux-arm-kernel@lists.infradead.org - " linux-ia64@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Use common ACPI resource parsing interface to parse ACPI resources for\n" @@ -533,7 +517,7 @@ " \t\tkfree(info);\n" " \t\treturn NULL;\n" " \t}\n" - "-\t/* insert busn resource at first */\n" + "-\t/* insert busn resource@first */\n" "+\tadd_resources(info, &info->bridge->dev);\n" " \tpci_add_resource(&info->resources, &root->secondary);\n" "+\n" @@ -555,4 +539,4 @@ "-- \n" 1.7.10.4 -b19a350da2b57a579520bf7d2d4700b35834ff832d39e089765710ddd9d9a5c8 +1dab1784d7e7146b17e67ae628212c99c302955411a89a64fd202df06139a1a7
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.