diff for duplicates of <20060106223932.GB9230@lists.us.dell.com> diff --git a/a/1.txt b/N1/1.txt index fa83c1f..9e452e4 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -57,7 +57,7 @@ index 6a93d75..2764eab 100644 u8 buf[15]; - char __iomem *p, *q; + memcpy_fromio(buf, p, 15); -+ if ((memcmp(buf, "_DMI_", 5) = 0) && dmi_checksum(buf)) { ++ if ((memcmp(buf, "_DMI_", 5) == 0) && dmi_checksum(buf)) { + u16 num = (buf[13] << 8) | buf[12]; + u16 len = (buf[7] << 8) | buf[6]; + u32 base = (buf[11] << 24) | (buf[10] << 16) | @@ -69,7 +69,7 @@ index 6a93d75..2764eab 100644 - * it shouldn't if we actually call it. - */ - p = ioremap(0xF0000, 0x10000); -- if (p = NULL) +- if (p == NULL) - goto out; + /* + * DMI version 0.0 means that the real version is taken from @@ -80,7 +80,7 @@ index 6a93d75..2764eab 100644 + buf[14] >> 4, buf[14] & 0xF); + else + printk(KERN_INFO "DMI present.\n"); -+ if (dmi_table(base,len, num, dmi_decode) = 0) ++ if (dmi_table(base,len, num, dmi_decode) == 0) + return 0; + } + return 1; @@ -88,7 +88,7 @@ index 6a93d75..2764eab 100644 - for (q = p; q < p + 0x10000; q += 16) { - memcpy_fromio(buf, q, 15); -- if ((memcmp(buf, "_DMI_", 5) = 0) && dmi_checksum(buf)) { +- if ((memcmp(buf, "_DMI_", 5) == 0) && dmi_checksum(buf)) { - u16 num = (buf[13] << 8) | buf[12]; - u16 len = (buf[7] << 8) | buf[6]; - u32 base = (buf[11] << 24) | (buf[10] << 16) | @@ -108,7 +108,7 @@ index 6a93d75..2764eab 100644 + char __iomem *p, *q; + int rc; -- if (dmi_table(base,len, num, dmi_decode) = 0) +- if (dmi_table(base,len, num, dmi_decode) == 0) + if (efi_enabled) { + if (!efi.smbios) + goto out; @@ -118,7 +118,7 @@ index 6a93d75..2764eab 100644 + * iounmap the space when we're done with it. + */ + p = ioremap((unsigned long)efi.smbios, 0x10000); -+ if (p = NULL) ++ if (p == NULL) + goto out; + + rc = dmi_present(p + 0x10); /* offset of _DMI_ string */ @@ -133,7 +133,7 @@ index 6a93d75..2764eab 100644 + * it shouldn't if we actually call it. + */ + p = ioremap(0xF0000, 0x10000); -+ if (p = NULL) ++ if (p == NULL) + goto out; + + for (q = p; q < p + 0x10000; q += 16) { diff --git a/a/content_digest b/N1/content_digest index d86bace..7ddd3cf 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020060106172140.GB19605@lists.us.dell.com\0" "From\0Matt Domsch <Matt_Domsch@dell.com>\0" "Subject\0[PATCH 2.6.15] ia64: use i386 dmi_scan.c\0" - "Date\0Fri, 06 Jan 2006 22:39:32 +0000\0" + "Date\0Fri, 6 Jan 2006 16:39:32 -0600\0" "To\0linux-ia64@vger.kernel.org" ak@suse.de openipmi-developer@lists.sourceforge.net @@ -71,7 +71,7 @@ " \tu8 buf[15];\n" "-\tchar __iomem *p, *q;\n" "+\tmemcpy_fromio(buf, p, 15);\n" - "+\tif ((memcmp(buf, \"_DMI_\", 5) = 0) && dmi_checksum(buf)) {\n" + "+\tif ((memcmp(buf, \"_DMI_\", 5) == 0) && dmi_checksum(buf)) {\n" "+\t\tu16 num = (buf[13] << 8) | buf[12];\n" "+\t\tu16 len = (buf[7] << 8) | buf[6];\n" "+\t\tu32 base = (buf[11] << 24) | (buf[10] << 16) |\n" @@ -83,7 +83,7 @@ "-\t * it shouldn't if we actually call it.\n" "-\t */\n" "-\tp = ioremap(0xF0000, 0x10000);\n" - "-\tif (p = NULL)\n" + "-\tif (p == NULL)\n" "-\t\tgoto out;\n" "+\t\t/*\n" "+\t\t * DMI version 0.0 means that the real version is taken from\n" @@ -94,7 +94,7 @@ "+\t\t\t buf[14] >> 4, buf[14] & 0xF);\n" "+\t\telse\n" "+\t\t\tprintk(KERN_INFO \"DMI present.\\n\");\n" - "+\t\tif (dmi_table(base,len, num, dmi_decode) = 0)\n" + "+\t\tif (dmi_table(base,len, num, dmi_decode) == 0)\n" "+\t\t\treturn 0;\n" "+\t}\n" "+\treturn 1;\n" @@ -102,7 +102,7 @@ " \n" "-\tfor (q = p; q < p + 0x10000; q += 16) {\n" "-\t\tmemcpy_fromio(buf, q, 15);\n" - "-\t\tif ((memcmp(buf, \"_DMI_\", 5) = 0) && dmi_checksum(buf)) {\n" + "-\t\tif ((memcmp(buf, \"_DMI_\", 5) == 0) && dmi_checksum(buf)) {\n" "-\t\t\tu16 num = (buf[13] << 8) | buf[12];\n" "-\t\t\tu16 len = (buf[7] << 8) | buf[6];\n" "-\t\t\tu32 base = (buf[11] << 24) | (buf[10] << 16) |\n" @@ -122,7 +122,7 @@ "+\tchar __iomem *p, *q;\n" "+\tint rc;\n" " \n" - "-\t\t\tif (dmi_table(base,len, num, dmi_decode) = 0)\n" + "-\t\t\tif (dmi_table(base,len, num, dmi_decode) == 0)\n" "+\tif (efi_enabled) {\n" "+\t\tif (!efi.smbios)\n" "+\t\t\tgoto out;\n" @@ -132,7 +132,7 @@ "+ * iounmap the space when we're done with it.\n" "+\t\t*/\n" "+\t\tp = ioremap((unsigned long)efi.smbios, 0x10000);\n" - "+\t\tif (p = NULL)\n" + "+\t\tif (p == NULL)\n" "+\t\t\tgoto out;\n" "+\n" "+\t\trc = dmi_present(p + 0x10); /* offset of _DMI_ string */\n" @@ -147,7 +147,7 @@ "+\t\t * it shouldn't if we actually call it.\n" "+\t\t */\n" "+\t\tp = ioremap(0xF0000, 0x10000);\n" - "+\t\tif (p = NULL)\n" + "+\t\tif (p == NULL)\n" "+\t\t\tgoto out;\n" "+\n" "+\t\tfor (q = p; q < p + 0x10000; q += 16) {\n" @@ -240,4 +240,4 @@ " \n" /* -f9ce59d3afd6d34dcf66709123e8533f692c389dc257ae44fa41ef7ddff794eb +ab3eae75f085a5f6e63beb5fa3250bbc7c71a6d25a1d9cd485e6e716bbfe5712
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.