diff for duplicates of <20131016235541.GD17866@google.com> diff --git a/a/1.txt b/N1/1.txt index 5df8a40..0cc2e93 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -33,8 +33,8 @@ On Fri, Oct 11, 2013 at 08:19:01PM +0800, tianyu.lan@intel.com wrote: > - status = acpi_resource_to_address64(resource, addr); > + status = acpi_dev_resource_address_space_full(ares, addr, res); > 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) && > @@ -255,51 +256,54 @@ static acpi_status resource_to_window(struct acpi_resource *resource, > return AE_ERROR; > } @@ -73,17 +73,17 @@ On Fri, Oct 11, 2013 at 08:19:01PM +0800, tianyu.lan@intel.com wrote: > if (!ACPI_SUCCESS(status)) > return AE_OK; > -> - if (addr.resource_type == ACPI_MEMORY_RANGE) { +> - if (addr.resource_type = ACPI_MEMORY_RANGE) { > - flags = IORESOURCE_MEM; > + if (resource->flags & IORESOURCE_MEM) { > root = &iomem_resource; > offset = addr.translation_offset; -> - } else if (addr.resource_type == ACPI_IO_RANGE) { +> - } else if (addr.resource_type = ACPI_IO_RANGE) { > - flags = IORESOURCE_IO; > + } else if (resource->flags & IORESOURCE_IO) { > root = &ioport_resource; > offset = add_io_space(info, &addr); -> if (offset == ~0) +> if (offset = ~0) > return AE_OK; > + > + /* diff --git a/a/content_digest b/N1/content_digest index 8721616..0bcf21f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01381493941-4650-6-git-send-email-tianyu.lan@intel.com\0" "From\0Bjorn Helgaas <bhelgaas@google.com>\0" "Subject\0Re: [Resend PATCH 5/5] IA64/PCI/ACPI: Rework PCI root bridge ACPI resource conversion\0" - "Date\0Wed, 16 Oct 2013 17:55:41 -0600\0" + "Date\0Wed, 16 Oct 2013 23:55:41 +0000\0" "To\0tianyu.lan@intel.com\0" "Cc\0tony.luck@intel.com" lenb@kernel.org @@ -48,8 +48,8 @@ "> -\tstatus = acpi_resource_to_address64(resource, addr);\n" "> +\tstatus = acpi_dev_resource_address_space_full(ares, addr, res);\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" "> @@ -255,51 +256,54 @@ static acpi_status resource_to_window(struct acpi_resource *resource,\n" "> \treturn AE_ERROR;\n" "> }\n" @@ -88,17 +88,17 @@ "> \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" "> +\tif (resource->flags & IORESOURCE_MEM) {\n" "> \t\troot = &iomem_resource;\n" "> \t\toffset = addr.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} else if (resource->flags & 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" "> +\n" "> +\t\t/*\n" @@ -147,4 +147,4 @@ "> 1.8.2.1\n" > -5c4621c60cc259ffa3a99a0e12a71b6d93bc7887f0281f1040fe9c7acbcabb29 +c960cd699e72f2bacaa2fd7d95baa389fb477db842797fb3c15ecafc09fb3c19
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.