diff for duplicates of <20040920092947.B14208@unix-os.sc.intel.com> diff --git a/a/1.txt b/N1/1.txt index a25f015..9943bc6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -238,7 +238,7 @@ diff -puN drivers/acpi/scan.c~acpi_core drivers/acpi/scan.c + status = acpi_get_next_object(ACPI_TYPE_ANY, phandle, + chandle, &chandle); + if (ACPI_SUCCESS(status) && chandle != NULL) { -+ if (acpi_bus_get_device(chandle, &child) == 0) ++ if (acpi_bus_get_device(chandle, &child) = 0) + acpi_bus_trim(child, 1); + } else { + /* this is a leaf */ @@ -289,10 +289,10 @@ diff -puN drivers/acpi/pci_irq.c~acpi_core drivers/acpi/pci_irq.c + spin_lock(&acpi_prt_lock); list_for_each(node, &acpi_prt.entries) { entry = list_entry(node, struct acpi_prt_entry, node); - if ((segment == entry->id.segment) - && (bus == entry->id.bus) - && (device == entry->id.device) - && (pin == entry->pin)) { + if ((segment = entry->id.segment) + && (bus = entry->id.bus) + && (device = entry->id.device) + && (pin = entry->pin)) { + spin_unlock(&acpi_prt_lock); return_PTR(entry); } @@ -322,7 +322,7 @@ diff -puN drivers/acpi/pci_irq.c~acpi_core drivers/acpi/pci_irq.c + int bus, + struct acpi_prt_entry *entry) +{ -+ if (segment == entry->id.segment && bus == entry->id.bus){ ++ if (segment = entry->id.segment && bus = entry->id.bus){ + acpi_prt.count--; + list_del(&entry->node); + kfree(entry); diff --git a/a/content_digest b/N1/content_digest index 589f8f7..ed15460 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020040920092520.A14208@unix-os.sc.intel.com\0" "From\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" "Subject\0Re: PATCH-ACPI based CPU hotplug[0/6]-Core ACPI enhancement support\0" - "Date\0Mon, 20 Sep 2004 09:29:47 -0700\0" + "Date\0Mon, 20 Sep 2004 16:29:47 +0000\0" "To\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" "Cc\0Brown" Len <len.brown@intel.com> @@ -251,7 +251,7 @@ "+\t\tstatus = acpi_get_next_object(ACPI_TYPE_ANY, phandle,\n" "+\t\t\tchandle, &chandle);\n" "+\t\tif (ACPI_SUCCESS(status) && chandle != NULL)\t{\n" - "+\t\t\tif (acpi_bus_get_device(chandle, &child) == 0)\n" + "+\t\t\tif (acpi_bus_get_device(chandle, &child) = 0)\n" "+\t\t\t\tacpi_bus_trim(child, 1);\n" "+\t\t} else {\n" "+\t\t\t/* this is a leaf */\n" @@ -302,10 +302,10 @@ "+\tspin_lock(&acpi_prt_lock);\n" " \tlist_for_each(node, &acpi_prt.entries) {\n" " \t\tentry = list_entry(node, struct acpi_prt_entry, node);\n" - " \t\tif ((segment == entry->id.segment) \n" - " \t\t\t&& (bus == entry->id.bus) \n" - " \t\t\t&& (device == entry->id.device)\n" - " \t\t\t&& (pin == entry->pin)) {\n" + " \t\tif ((segment = entry->id.segment) \n" + " \t\t\t&& (bus = entry->id.bus) \n" + " \t\t\t&& (device = entry->id.device)\n" + " \t\t\t&& (pin = entry->pin)) {\n" "+\t\t\tspin_unlock(&acpi_prt_lock);\n" " \t\t\treturn_PTR(entry);\n" " \t\t}\n" @@ -335,7 +335,7 @@ "+\tint\t\t\t\tbus,\n" "+\tstruct acpi_prt_entry\t\t*entry)\n" "+{\n" - "+\tif (segment == entry->id.segment && bus == entry->id.bus){\n" + "+\tif (segment = entry->id.segment && bus = entry->id.bus){\n" "+\t\tacpi_prt.count--;\n" "+\t\tlist_del(&entry->node);\n" "+\t\tkfree(entry);\n" @@ -458,4 +458,4 @@ " \tacpi_handle\t\thandle,\n" _ -f973242d8419910d77f265109054741225de86376b2a1cfeb8e9a06d29c1c1c7 +c6958e63b211be7be62a47f768a5e87504da43e3cc0c211c4bc26ee7a5b18195
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.