diff for duplicates of <4F8FF399.3000308@linux.vnet.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 0585535..7d5a29b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -17,7 +17,7 @@ On 04/19/2012 04:32 PM, Borislav Petkov wrote: >>> >>> err = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val); >>> - if (err) { ->>> - if (err = -EEXIST) +>>> - if (err == -EEXIST) >>> - printk(KERN_WARNING "L3 disable slot %d in use!\n", >>> - slot); >>> + if (err) @@ -126,7 +126,7 @@ On 04/19/2012 04:32 PM, Borislav Petkov wrote: > return -EINVAL; > > /* check whether the other slot has disabled the same index already */ -> if (index = amd_get_l3_disable_slot(nb, !slot)) +> if (index == amd_get_l3_disable_slot(nb, !slot)) > - return -EINVAL; > + return -EEXIST; > @@ -135,7 +135,7 @@ On 04/19/2012 04:32 PM, Borislav Petkov wrote: > @@ -468,8 +468,8 @@ static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf, > err = amd_set_l3_disable_slot(this_leaf->base.nb, cpu, slot, val); > if (err) { -> if (err = -EEXIST) +> if (err == -EEXIST) > - printk(KERN_WARNING "L3 disable slot %d in use!\n", > - slot); > + pr_warning("L3 slot %d in use/index already disabled!\n", diff --git a/a/content_digest b/N1/content_digest index 53d3941..c0976bd 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,7 +3,7 @@ "ref\020120419110229.GB30447@aftab\0" "From\0Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>\0" "Subject\0Re: [patch] cpu: remove some dead code in store_cache_disable()\0" - "Date\0Thu, 19 Apr 2012 11:26:33 +0000\0" + "Date\0Thu, 19 Apr 2012 16:44:33 +0530\0" "To\0Borislav Petkov <bp@amd64.org>\0" "Cc\0Dan Carpenter <dan.carpenter@oracle.com>" Thomas Gleixner <tglx@linutronix.de> @@ -34,7 +34,7 @@ ">>>\n" ">>> \terr = amd_set_l3_disable_slot(this_leaf->base.nb, 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" ">>> +\tif (err)\n" @@ -143,7 +143,7 @@ "> \t\treturn -EINVAL;\n" "> \n" "> \t/* check whether the other slot has disabled the same index already */\n" - "> \tif (index = amd_get_l3_disable_slot(nb, !slot))\n" + "> \tif (index == amd_get_l3_disable_slot(nb, !slot))\n" "> -\t\treturn -EINVAL;\n" "> +\t\treturn -EEXIST;\n" "> \n" @@ -152,7 +152,7 @@ "> @@ -468,8 +468,8 @@ static ssize_t store_cache_disable(struct _cpuid4_info *this_leaf,\n" "> \terr = amd_set_l3_disable_slot(this_leaf->base.nb, 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\t\tpr_warning(\"L3 slot %d in use/index already disabled!\\n\",\n" @@ -167,4 +167,4 @@ "Regards,\n" Srivatsa S. Bhat -e42218f606199bba887198b7bbced3ff61d2c935fcd31667af641aa32db59e73 +f1249a0d4d3e7db55e0bf9a8c06ba74d0368fc7659ec9306cffe23344963e900
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.