diff for duplicates of <20040924165157.F27778@unix-os.sc.intel.com> diff --git a/a/1.txt b/N1/1.txt index 615a5af..033c36e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -169,7 +169,7 @@ diff -puN /dev/null drivers/acpi/container.c + if (ACPI_FAILURE(status)) + return_VALUE(0); /* Firmware error */ + -+ return_VALUE((sta & ACPI_STA_PRESENT) == ACPI_STA_PRESENT); ++ return_VALUE((sta & ACPI_STA_PRESENT) = ACPI_STA_PRESENT); +} + +/*******************************************************************/ @@ -253,7 +253,7 @@ diff -puN /dev/null drivers/acpi/container.c + envp[i++] = "PATH=/sbin;/bin;/usr/sbin;/usr/bin"; + envp[i++] = action_str; + envp[i++] = container_str; -+ envp[i++] = "PLATFORM=ACPI"; ++ envp[i++] = "PLATFORM¬PI"; + envp[i] = NULL; + + ret = call_usermodehelper(argv[0], argv, envp, 0); @@ -305,7 +305,7 @@ diff -puN /dev/null drivers/acpi/container.c + /* Fall through */ + case ACPI_NOTIFY_DEVICE_CHECK: + printk("Container driver received %s event\n", -+ (type == ACPI_NOTIFY_BUS_CHECK)? ++ (type = ACPI_NOTIFY_BUS_CHECK)? + "ACPI_NOTIFY_BUS_CHECK":"ACPI_NOTIFY_DEVICE_CHECK"); + if (present) { + status = acpi_bus_get_device(handle, &device); @@ -353,7 +353,7 @@ diff -puN /dev/null drivers/acpi/container.c + if (info->valid & ACPI_VALID_HID) + hid = info->hardware_id.value; + -+ if (hid == NULL) { ++ if (hid = NULL) { + goto end; + } + diff --git a/a/content_digest b/N1/content_digest index 0b5082a..7a6517f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020040920094719.H14208@unix-os.sc.intel.com\0" "From\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" "Subject\0Re: PATCH-ACPI based CPU hotplug[6/6]-ACPI Container driver\0" - "Date\0Fri, 24 Sep 2004 16:51:57 -0700\0" + "Date\0Fri, 24 Sep 2004 23:51:57 +0000\0" "To\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" "Cc\0Len Brown <len.brown@intel.com>" ACPI Developer <acpi-devel@lists.sourceforge.net> @@ -182,7 +182,7 @@ "+\tif (ACPI_FAILURE(status))\n" "+\t\treturn_VALUE(0); /* Firmware error */\n" "+\n" - "+\treturn_VALUE((sta & ACPI_STA_PRESENT) == ACPI_STA_PRESENT);\n" + "+\treturn_VALUE((sta & ACPI_STA_PRESENT) = ACPI_STA_PRESENT);\n" "+}\n" "+\n" "+/*******************************************************************/\n" @@ -266,7 +266,7 @@ "+\tenvp[i++] = \"PATH=/sbin;/bin;/usr/sbin;/usr/bin\";\n" "+\tenvp[i++] = action_str;\n" "+\tenvp[i++] = container_str;\n" - "+\tenvp[i++] = \"PLATFORM=ACPI\";\n" + "+\tenvp[i++] = \"PLATFORM\302\254PI\";\n" "+\tenvp[i] = NULL;\n" "+\n" "+\tret = call_usermodehelper(argv[0], argv, envp, 0);\n" @@ -318,7 +318,7 @@ "+\t\t/* Fall through */\n" "+\tcase ACPI_NOTIFY_DEVICE_CHECK:\n" "+\t\tprintk(\"Container driver received %s event\\n\",\n" - "+\t\t\t(type == ACPI_NOTIFY_BUS_CHECK)?\n" + "+\t\t\t(type = ACPI_NOTIFY_BUS_CHECK)?\n" "+\t\t\t\"ACPI_NOTIFY_BUS_CHECK\":\"ACPI_NOTIFY_DEVICE_CHECK\");\n" "+\t\tif (present) {\n" "+\t\t\tstatus = acpi_bus_get_device(handle, &device);\n" @@ -366,7 +366,7 @@ "+\tif (info->valid & ACPI_VALID_HID)\n" "+\t\thid = info->hardware_id.value;\n" "+\n" - "+\tif (hid == NULL) {\n" + "+\tif (hid = NULL) {\n" "+\t\tgoto end;\n" "+\t}\n" "+\n" @@ -441,4 +441,4 @@ "+module_exit(acpi_container_exit);\n" _ -b715cca342bfd57accb5d178ece787c3fe2c6b52b884eb638ec65a870752c989 +063a2a3cb35b50c472d99a5e2769ef76f779750b48e92b9d761ccfe330d9535a
diff --git a/a/content_digest b/N2/content_digest index 0b5082a..64ad507 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -3,7 +3,8 @@ "From\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" "Subject\0Re: PATCH-ACPI based CPU hotplug[6/6]-ACPI Container driver\0" "Date\0Fri, 24 Sep 2004 16:51:57 -0700\0" - "To\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>\0" + "To\0Keshavamurthy Anil S <anil.s.keshavamurthy@intel.com>" + " Len Brown <len.brown@intel.com>\0" "Cc\0Len Brown <len.brown@intel.com>" ACPI Developer <acpi-devel@lists.sourceforge.net> LHNS list <lhns-devel@lists.sourceforge.net> @@ -441,4 +442,4 @@ "+module_exit(acpi_container_exit);\n" _ -b715cca342bfd57accb5d178ece787c3fe2c6b52b884eb638ec65a870752c989 +12ca8966d1460ea0f28866235f0689889735807a353c6b9f9d96d68578f5bfc0
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.