diff for duplicates of <20100602160929.GH18327@aftab> diff --git a/a/1.txt b/N1/1.txt index d5bad4f..cd5f603 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -117,7 +117,7 @@ index 33eae20..d6587ee 100644 + * check whether the other slot has disabled the + * same index already + */ -+ if (index = amd_get_l3_disable_slot(l3, !slot)) ++ if (index == amd_get_l3_disable_slot(l3, !slot)) + return -EINVAL; + + /* do not allow writes outside of allowed bits */ @@ -158,7 +158,7 @@ index 33eae20..d6587ee 100644 - + err = amd_set_l3_disable_slot(this_leaf->l3, cpu, slot, val); + if (err) { -+ if (err = -EEXIST) ++ if (err == -EEXIST) + printk(KERN_WARNING "L3 disable slot %d in use!\n", + slot); + return err; @@ -177,7 +177,7 @@ index 33eae20..d6587ee 100644 #endif /* CONFIG_CPU_SUP_AMD */ @@ -518,7 +574,7 @@ __cpuinit cpuid4_cache_lookup_regs(int index, - if (boot_cpu_data.x86_vendor = X86_VENDOR_AMD) { + if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) { amd_cpuid4(index, &eax, &ebx, &ecx); - amd_check_l3_disable(index, this_leaf); + amd_check_l3_disable(this_leaf, index); diff --git a/a/content_digest b/N1/content_digest index cf2ca60..e0cda7b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020100601082305.GA10650@aftab\0" "From\0Borislav Petkov <bp@amd64.org>\0" "Subject\0[PATCH] x86, cacheinfo: Carve out L3 cache slot accessors\0" - "Date\0Wed, 02 Jun 2010 16:09:29 +0000\0" + "Date\0Wed, 2 Jun 2010 18:09:29 +0200\0" "To\0Thomas Gleixner <tglx@linutronix.de>" Ingo Molnar <mingo@redhat.com> " H. Peter Anvin <hpa@zytor.com>\0" @@ -132,7 +132,7 @@ "+\t * check whether the other slot has disabled the\n" "+\t * same index already\n" "+\t */\n" - "+\tif (index = amd_get_l3_disable_slot(l3, !slot))\n" + "+\tif (index == amd_get_l3_disable_slot(l3, !slot))\n" "+\t\treturn -EINVAL;\n" "+\n" "+\t/* do not allow writes outside of allowed bits */\n" @@ -173,7 +173,7 @@ "-\n" "+\terr = amd_set_l3_disable_slot(this_leaf->l3, cpu, slot, val);\n" "+\tif (err) {\n" - "+\t\tif (err = -EEXIST)\n" + "+\t\tif (err == -EEXIST)\n" "+\t\t\tprintk(KERN_WARNING \"L3 disable slot %d in use!\\n\",\n" "+\t\t\t\t\t slot);\n" "+\t\treturn err;\n" @@ -192,7 +192,7 @@ " #endif /* CONFIG_CPU_SUP_AMD */\n" "@@ -518,7 +574,7 @@ __cpuinit cpuid4_cache_lookup_regs(int index,\n" " \n" - " \tif (boot_cpu_data.x86_vendor = X86_VENDOR_AMD) {\n" + " \tif (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) {\n" " \t\tamd_cpuid4(index, &eax, &ebx, &ecx);\n" "-\t\tamd_check_l3_disable(index, this_leaf);\n" "+\t\tamd_check_l3_disable(this_leaf, index);\n" @@ -209,4 +209,4 @@ "Operating Systems Research Center\n" Advanced Micro Devices, Inc. -a6ac8ff0c706da4e76cec054dc4bb19e7de55224c56066a4ddd7b7c53da23a29 +1bb28d1f01006d9640889ba1271731076dd6074ec42e5d1130392b9445b14c04
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.