diff for duplicates of <1422442660-455-2-git-send-email-jiang.liu@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 1073e09..1cdfd4f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -56,10 +56,10 @@ index 8b9318d311a0..bd09bf74f187 100644 @@ -69,10 +69,10 @@ static acpi_status find_csr_space(struct acpi_resource *resource, void *data) status = acpi_resource_to_address64(resource, &addr); if (ACPI_SUCCESS(status) && - addr.resource_type == ACPI_MEMORY_RANGE && + addr.resource_type = ACPI_MEMORY_RANGE && - addr.address_length && + addr.address.address_length && - addr.producer_consumer == ACPI_CONSUMER) { + addr.producer_consumer = ACPI_CONSUMER) { - space->base = addr.minimum; - space->length = addr.address_length; + space->base = addr.address.minimum; @@ -79,30 +79,30 @@ index 900cc93e5409..48cc65705db4 100644 - max = min + addr->address_length - 1; + 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) sparse = 1; - space_nr = new_space(addr->translation_offset, sparse); + space_nr = new_space(addr->address.translation_offset, sparse); - if (space_nr == ~0) + if (space_nr = ~0) goto free_resource; @@ -247,7 +247,7 @@ static acpi_status resource_to_window(struct acpi_resource *resource, 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_length && + addr->address.address_length && - addr->producer_consumer == ACPI_PRODUCER) + addr->producer_consumer = ACPI_PRODUCER) return AE_OK; @@ -284,7 +284,7 @@ static acpi_status add_window(struct acpi_resource *res, void *data) - if (addr.resource_type == ACPI_MEMORY_RANGE) { + if (addr.resource_type = ACPI_MEMORY_RANGE) { flags = IORESOURCE_MEM; root = &iomem_resource; - offset = addr.translation_offset; + 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; @@ -297,8 +297,8 @@ static acpi_status add_window(struct acpi_resource *res, void *data) @@ -155,8 +155,8 @@ index cfd1b132b8e3..bb98afd0591e 100644 case ACPI_RESOURCE_TYPE_ADDRESS32: @@ -256,7 +256,7 @@ static acpi_status resource_to_addr(struct acpi_resource *resource, 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_length > 0) { + addr->address.address_length > 0) { return AE_OK; @@ -208,11 +208,11 @@ index 23e2319ead41..ee28f4d15625 100644 +++ b/drivers/acpi/acpi_memhotplug.c @@ -101,8 +101,8 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context) /* Can we combine the resource range information? */ - if ((info->caching == address64.info.mem.caching) && - (info->write_protect == address64.info.mem.write_protect) && -- (info->start_addr + info->length == address64.minimum)) { + if ((info->caching = address64.info.mem.caching) && + (info->write_protect = address64.info.mem.write_protect) && +- (info->start_addr + info->length = address64.minimum)) { - info->length += address64.address_length; -+ (info->start_addr + info->length == address64.address.minimum)) { ++ (info->start_addr + info->length = address64.address.minimum)) { + info->length += address64.address.address_length; return AE_OK; } @@ -398,7 +398,7 @@ index c6bcb8c719d8..e53e0f659204 100644 - if ((address.address_length > 0) && + if ((address.address.address_length > 0) && - (address.resource_type == ACPI_BUS_NUMBER_RANGE)) { + (address.resource_type = ACPI_BUS_NUMBER_RANGE)) { - res->start = address.minimum; - res->end = address.minimum + address.address_length - 1; + res->start = address.address.minimum; @@ -418,7 +418,7 @@ index 782a0d15c25f..d0a4d90c6bcc 100644 - res->end = addr.maximum; + res->start = addr.address.minimum; + res->end = addr.address.maximum; - window = addr.producer_consumer == ACPI_PRODUCER; + window = addr.producer_consumer = ACPI_PRODUCER; switch(addr.resource_type) { case ACPI_MEMORY_RANGE: @@ -429,8 +429,8 @@ index 782a0d15c25f..d0a4d90c6bcc 100644 window); break; case ACPI_IO_RANGE: -- io_decode = addr.granularity == 0xfff ? -+ io_decode = addr.address.granularity == 0xfff ? +- io_decode = addr.granularity = 0xfff ? ++ io_decode = addr.address.granularity = 0xfff ? ACPI_DECODE_10 : ACPI_DECODE_16; - res->flags = acpi_dev_ioresource_flags(addr.minimum, - addr.maximum, @@ -447,7 +447,7 @@ index 782a0d15c25f..d0a4d90c6bcc 100644 - res->end = ext_addr->maximum; + res->start = ext_addr->address.minimum; + res->end = ext_addr->address.maximum; - window = ext_addr->producer_consumer == ACPI_PRODUCER; + window = ext_addr->producer_consumer = ACPI_PRODUCER; switch(ext_addr->resource_type) { case ACPI_MEMORY_RANGE: @@ -458,8 +458,8 @@ index 782a0d15c25f..d0a4d90c6bcc 100644 window); break; case ACPI_IO_RANGE: -- io_decode = ext_addr->granularity == 0xfff ? -+ io_decode = ext_addr->address.granularity == 0xfff ? +- io_decode = ext_addr->granularity = 0xfff ? ++ io_decode = ext_addr->address.granularity = 0xfff ? ACPI_DECODE_10 : ACPI_DECODE_16; - res->flags = acpi_dev_ioresource_flags(ext_addr->minimum, - ext_addr->maximum, @@ -503,15 +503,15 @@ index 66977ebf13b3..2d9bc789af0f 100644 --- a/drivers/pnp/pnpacpi/rsparser.c +++ b/drivers/pnp/pnpacpi/rsparser.c @@ -410,12 +410,12 @@ static __init void pnpacpi_parse_address_option(struct pnp_dev *dev, - if (p->resource_type == ACPI_MEMORY_RANGE) { - if (p->info.mem.write_protect == ACPI_READ_WRITE_MEMORY) + if (p->resource_type = ACPI_MEMORY_RANGE) { + if (p->info.mem.write_protect = ACPI_READ_WRITE_MEMORY) flags = IORESOURCE_MEM_WRITEABLE; - pnp_register_mem_resource(dev, option_flags, p->minimum, - p->minimum, 0, p->address_length, + pnp_register_mem_resource(dev, option_flags, p->address.minimum, + p->address.minimum, 0, p->address.address_length, flags); - } else if (p->resource_type == ACPI_IO_RANGE) + } else if (p->resource_type = ACPI_IO_RANGE) - pnp_register_port_resource(dev, option_flags, p->minimum, - p->minimum, 0, p->address_length, + pnp_register_port_resource(dev, option_flags, p->address.minimum, @@ -520,15 +520,15 @@ index 66977ebf13b3..2d9bc789af0f 100644 } @@ -429,12 +429,12 @@ static __init void pnpacpi_parse_ext_address_option(struct pnp_dev *dev, - if (p->resource_type == ACPI_MEMORY_RANGE) { - if (p->info.mem.write_protect == ACPI_READ_WRITE_MEMORY) + if (p->resource_type = ACPI_MEMORY_RANGE) { + if (p->info.mem.write_protect = ACPI_READ_WRITE_MEMORY) flags = IORESOURCE_MEM_WRITEABLE; - pnp_register_mem_resource(dev, option_flags, p->minimum, - p->minimum, 0, p->address_length, + pnp_register_mem_resource(dev, option_flags, p->address.minimum, + p->address.minimum, 0, p->address.address_length, flags); - } else if (p->resource_type == ACPI_IO_RANGE) + } else if (p->resource_type = ACPI_IO_RANGE) - pnp_register_port_resource(dev, option_flags, p->minimum, - p->minimum, 0, p->address_length, + pnp_register_port_resource(dev, option_flags, p->address.minimum, @@ -542,11 +542,11 @@ index 34e40b733f9a..4fc886cd5586 100644 +++ b/drivers/xen/xen-acpi-memhotplug.c @@ -117,8 +117,8 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context) list_for_each_entry(info, &mem_device->res_list, list) { - if ((info->caching == address64.info.mem.caching) && - (info->write_protect == address64.info.mem.write_protect) && -- (info->start_addr + info->length == address64.minimum)) { + if ((info->caching = address64.info.mem.caching) && + (info->write_protect = address64.info.mem.write_protect) && +- (info->start_addr + info->length = address64.minimum)) { - info->length += address64.address_length; -+ (info->start_addr + info->length == address64.address.minimum)) { ++ (info->start_addr + info->length = address64.address.minimum)) { + info->length += address64.address.address_length; return AE_OK; } diff --git a/a/content_digest b/N1/content_digest index 308dc83..347990f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\01422442660-455-1-git-send-email-jiang.liu@linux.intel.com\0" "From\0Jiang Liu <jiang.liu@linux.intel.com>\0" "Subject\0[Patch v2 01/22] ACPICA: Resources: Provide common part for struct acpi_resource_address structures.\0" - "Date\0Wed, 28 Jan 2015 18:57:19 +0800\0" + "Date\0Wed, 28 Jan 2015 10:57:19 +0000\0" "To\0Rafael J. Wysocki <rjw@rjwysocki.net>" Thomas Gleixner <tglx@linutronix.de> Bjorn Helgaas <bhelgaas@google.com> @@ -91,10 +91,10 @@ "@@ -69,10 +69,10 @@ static acpi_status find_csr_space(struct acpi_resource *resource, void *data)\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_MEMORY_RANGE &&\n" "-\t addr.address_length &&\n" "+\t addr.address.address_length &&\n" - " \t addr.producer_consumer == ACPI_CONSUMER) {\n" + " \t addr.producer_consumer = ACPI_CONSUMER) {\n" "-\t\tspace->base = addr.minimum;\n" "-\t\tspace->length = addr.address_length;\n" "+\t\tspace->base = addr.address.minimum;\n" @@ -114,30 +114,30 @@ "-\tmax = min + addr->address_length - 1;\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" " \t\tsparse = 1;\n" " \n" "-\tspace_nr = new_space(addr->translation_offset, sparse);\n" "+\tspace_nr = new_space(addr->address.translation_offset, sparse);\n" - " \tif (space_nr == ~0)\n" + " \tif (space_nr = ~0)\n" " \t\tgoto free_resource;\n" " \n" "@@ -247,7 +247,7 @@ static acpi_status resource_to_window(struct acpi_resource *resource,\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_length &&\n" "+\t addr->address.address_length &&\n" - " \t addr->producer_consumer == ACPI_PRODUCER)\n" + " \t addr->producer_consumer = ACPI_PRODUCER)\n" " \t\treturn AE_OK;\n" " \n" "@@ -284,7 +284,7 @@ static acpi_status add_window(struct acpi_resource *res, void *data)\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.translation_offset;\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" "@@ -297,8 +297,8 @@ static acpi_status add_window(struct acpi_resource *res, void *data)\n" @@ -190,8 +190,8 @@ " \tcase ACPI_RESOURCE_TYPE_ADDRESS32:\n" "@@ -256,7 +256,7 @@ static acpi_status resource_to_addr(struct acpi_resource *resource,\n" " \t\tif (ACPI_SUCCESS(status) &&\n" - " \t\t (addr->resource_type == ACPI_MEMORY_RANGE ||\n" - " \t\t addr->resource_type == ACPI_IO_RANGE) &&\n" + " \t\t (addr->resource_type = ACPI_MEMORY_RANGE ||\n" + " \t\t addr->resource_type = ACPI_IO_RANGE) &&\n" "-\t\t addr->address_length > 0) {\n" "+\t\t addr->address.address_length > 0) {\n" " \t\t\treturn AE_OK;\n" @@ -243,11 +243,11 @@ "+++ b/drivers/acpi/acpi_memhotplug.c\n" "@@ -101,8 +101,8 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context)\n" " \t\t/* Can we combine the resource range information? */\n" - " \t\tif ((info->caching == address64.info.mem.caching) &&\n" - " \t\t (info->write_protect == address64.info.mem.write_protect) &&\n" - "-\t\t (info->start_addr + info->length == address64.minimum)) {\n" + " \t\tif ((info->caching = address64.info.mem.caching) &&\n" + " \t\t (info->write_protect = address64.info.mem.write_protect) &&\n" + "-\t\t (info->start_addr + info->length = address64.minimum)) {\n" "-\t\t\tinfo->length += address64.address_length;\n" - "+\t\t (info->start_addr + info->length == address64.address.minimum)) {\n" + "+\t\t (info->start_addr + info->length = address64.address.minimum)) {\n" "+\t\t\tinfo->length += address64.address.address_length;\n" " \t\t\treturn AE_OK;\n" " \t\t}\n" @@ -433,7 +433,7 @@ " \n" "-\tif ((address.address_length > 0) &&\n" "+\tif ((address.address.address_length > 0) &&\n" - " \t (address.resource_type == ACPI_BUS_NUMBER_RANGE)) {\n" + " \t (address.resource_type = ACPI_BUS_NUMBER_RANGE)) {\n" "-\t\tres->start = address.minimum;\n" "-\t\tres->end = address.minimum + address.address_length - 1;\n" "+\t\tres->start = address.address.minimum;\n" @@ -453,7 +453,7 @@ "-\tres->end = addr.maximum;\n" "+\tres->start = addr.address.minimum;\n" "+\tres->end = addr.address.maximum;\n" - " \twindow = addr.producer_consumer == ACPI_PRODUCER;\n" + " \twindow = addr.producer_consumer = ACPI_PRODUCER;\n" " \n" " \tswitch(addr.resource_type) {\n" " \tcase ACPI_MEMORY_RANGE:\n" @@ -464,8 +464,8 @@ " \t\t\t\t\t\twindow);\n" " \t\tbreak;\n" " \tcase ACPI_IO_RANGE:\n" - "-\t\tio_decode = addr.granularity == 0xfff ?\n" - "+\t\tio_decode = addr.address.granularity == 0xfff ?\n" + "-\t\tio_decode = addr.granularity = 0xfff ?\n" + "+\t\tio_decode = addr.address.granularity = 0xfff ?\n" " \t\t\t\tACPI_DECODE_10 : ACPI_DECODE_16;\n" "-\t\tres->flags = acpi_dev_ioresource_flags(addr.minimum,\n" "-\t\t\t\t\t\t addr.maximum,\n" @@ -482,7 +482,7 @@ "-\tres->end = ext_addr->maximum;\n" "+\tres->start = ext_addr->address.minimum;\n" "+\tres->end = ext_addr->address.maximum;\n" - " \twindow = ext_addr->producer_consumer == ACPI_PRODUCER;\n" + " \twindow = ext_addr->producer_consumer = ACPI_PRODUCER;\n" " \n" " \tswitch(ext_addr->resource_type) {\n" " \tcase ACPI_MEMORY_RANGE:\n" @@ -493,8 +493,8 @@ " \t\t\t\t\twindow);\n" " \t\tbreak;\n" " \tcase ACPI_IO_RANGE:\n" - "-\t\tio_decode = ext_addr->granularity == 0xfff ?\n" - "+\t\tio_decode = ext_addr->address.granularity == 0xfff ?\n" + "-\t\tio_decode = ext_addr->granularity = 0xfff ?\n" + "+\t\tio_decode = ext_addr->address.granularity = 0xfff ?\n" " \t\t\t\tACPI_DECODE_10 : ACPI_DECODE_16;\n" "-\t\tres->flags = acpi_dev_ioresource_flags(ext_addr->minimum,\n" "-\t\t\t\t\t\t ext_addr->maximum,\n" @@ -538,15 +538,15 @@ "--- a/drivers/pnp/pnpacpi/rsparser.c\n" "+++ b/drivers/pnp/pnpacpi/rsparser.c\n" "@@ -410,12 +410,12 @@ static __init void pnpacpi_parse_address_option(struct pnp_dev *dev,\n" - " \tif (p->resource_type == ACPI_MEMORY_RANGE) {\n" - " \t\tif (p->info.mem.write_protect == ACPI_READ_WRITE_MEMORY)\n" + " \tif (p->resource_type = ACPI_MEMORY_RANGE) {\n" + " \t\tif (p->info.mem.write_protect = ACPI_READ_WRITE_MEMORY)\n" " \t\t\tflags = IORESOURCE_MEM_WRITEABLE;\n" "-\t\tpnp_register_mem_resource(dev, option_flags, p->minimum,\n" "-\t\t\t\t\t p->minimum, 0, p->address_length,\n" "+\t\tpnp_register_mem_resource(dev, option_flags, p->address.minimum,\n" "+\t\t\t\t\t p->address.minimum, 0, p->address.address_length,\n" " \t\t\t\t\t flags);\n" - " \t} else if (p->resource_type == ACPI_IO_RANGE)\n" + " \t} else if (p->resource_type = ACPI_IO_RANGE)\n" "-\t\tpnp_register_port_resource(dev, option_flags, p->minimum,\n" "-\t\t\t\t\t p->minimum, 0, p->address_length,\n" "+\t\tpnp_register_port_resource(dev, option_flags, p->address.minimum,\n" @@ -555,15 +555,15 @@ " }\n" " \n" "@@ -429,12 +429,12 @@ static __init void pnpacpi_parse_ext_address_option(struct pnp_dev *dev,\n" - " \tif (p->resource_type == ACPI_MEMORY_RANGE) {\n" - " \t\tif (p->info.mem.write_protect == ACPI_READ_WRITE_MEMORY)\n" + " \tif (p->resource_type = ACPI_MEMORY_RANGE) {\n" + " \t\tif (p->info.mem.write_protect = ACPI_READ_WRITE_MEMORY)\n" " \t\t\tflags = IORESOURCE_MEM_WRITEABLE;\n" "-\t\tpnp_register_mem_resource(dev, option_flags, p->minimum,\n" "-\t\t\t\t\t p->minimum, 0, p->address_length,\n" "+\t\tpnp_register_mem_resource(dev, option_flags, p->address.minimum,\n" "+\t\t\t\t\t p->address.minimum, 0, p->address.address_length,\n" " \t\t\t\t\t flags);\n" - " \t} else if (p->resource_type == ACPI_IO_RANGE)\n" + " \t} else if (p->resource_type = ACPI_IO_RANGE)\n" "-\t\tpnp_register_port_resource(dev, option_flags, p->minimum,\n" "-\t\t\t\t\t p->minimum, 0, p->address_length,\n" "+\t\tpnp_register_port_resource(dev, option_flags, p->address.minimum,\n" @@ -577,11 +577,11 @@ "+++ b/drivers/xen/xen-acpi-memhotplug.c\n" "@@ -117,8 +117,8 @@ acpi_memory_get_resource(struct acpi_resource *resource, void *context)\n" " \tlist_for_each_entry(info, &mem_device->res_list, list) {\n" - " \t\tif ((info->caching == address64.info.mem.caching) &&\n" - " \t\t (info->write_protect == address64.info.mem.write_protect) &&\n" - "-\t\t (info->start_addr + info->length == address64.minimum)) {\n" + " \t\tif ((info->caching = address64.info.mem.caching) &&\n" + " \t\t (info->write_protect = address64.info.mem.write_protect) &&\n" + "-\t\t (info->start_addr + info->length = address64.minimum)) {\n" "-\t\t\tinfo->length += address64.address_length;\n" - "+\t\t (info->start_addr + info->length == address64.address.minimum)) {\n" + "+\t\t (info->start_addr + info->length = address64.address.minimum)) {\n" "+\t\t\tinfo->length += address64.address.address_length;\n" " \t\t\treturn AE_OK;\n" " \t\t}\n" @@ -672,4 +672,4 @@ "-- \n" 1.7.10.4 -35895624afea7dc6ccdf02e3d4e0c836bb2d9cf86a5e83853f8894b3faff097d +f5f70414f24c53a38311c7296bd01d0eabc2c2b09c2b10b847a2944ebdb82a4d
diff --git a/a/content_digest b/N2/content_digest index 308dc83..62a7306 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -23,14 +23,14 @@ Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Boris Ostrovsky <boris.ostrovsky@oracle.com> " David Vrabel <david.vrabel@citrix.com>\0" - "Cc\0linux-ia64@vger.kernel.org" + "Cc\0linux-kernel@vger.kernel.org" linux-pci@vger.kernel.org - linux-kernel@vger.kernel.org linux-acpi@vger.kernel.org - xen-devel@lists.xenproject.org - devel@linuxdriverproject.org Jiang Liu <jiang.liu@linux.intel.com> - " devel@acpica.org\0" + linux-ia64@vger.kernel.org + devel@acpica.org + devel@linuxdriverproject.org + " xen-devel@lists.xenproject.org\0" "\00:1\0" "b\0" "From: Lv Zheng <lv.zheng@intel.com>\n" @@ -672,4 +672,4 @@ "-- \n" 1.7.10.4 -35895624afea7dc6ccdf02e3d4e0c836bb2d9cf86a5e83853f8894b3faff097d +f128a2bf6b2183da2934b5d267c1d445d57a5b9eb450d03fcc48ecc7af05f803
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.